Changeset 22692

Timestamp:

2010-08-19T20:10:17+12:00 (14 years ago)

Author:

ak19

Message:

Clean exit out of client GLI if the user cancelled out of the authentication popup that appears at the start

File:

• main/trunk/gli/src/org/greenstone/gatherer/remote/RemoteGreenstoneServer.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/remote/RemoteGreenstoneServer.java

@@ -489 +489 @@
         // Ask for authentication information (if necessary), then perform the action
         if(isAuthenticationRequired(gliserver_args)) {
-        authenticateUser();
+        try {
+            authenticateUser();
+        } catch (RemoteGreenstoneServerAction.ActionCancelledException e) {
+            // Authentication popup only appears at the start. If the user cancelled
+            // out of it, then another remote action always remains on the queue,
+            // preventing a clean exit. Need to clear queue before exit.
+            synchronized (remote_greenstone_server_action_queue) {          
+            remote_greenstone_server_action_queue.clear();          
+            }
+            Gatherer.exit();
+        }
         }
         String gliserver_url_string = Configuration.gliserver_url.toString();