Changeset 12310

Timestamp:

2006-07-27T13:52:26+12:00 (18 years ago)

Author:

davidb

Message:

Minor mods to Gatherer exit code to allow -- for the Windows case -- GLI
to restart in a different interface language. Windows case complicated
by threads used to monitor the external applications that have been launched
and still running.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (4 diffs)
• gui/Preferences.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -74 +74 @@
 
     /** Has the exit flag been set? */
+    static final public int EXIT_THEN_RESTART= 2;
     static public boolean exit = false;
+    static public int exit_status = 0;
 
     static private String gli_directory_path = null;
@@ -496 +498 @@
      * @see org.greenstone.gatherer.gui.GUIManager
      */
-    static public void exit(int exit_status)
+    static public void exit(int new_exit_status)
     {
     DebugStream.println("In Gatherer.exit()...");
     exit = true;
+    if (new_exit_status != 0) {
+        // default exit_status is already 0 
+        // only remember a new exit status if it is non-trivial
+        exit_status = new_exit_status;
+    }
 
     // Save the file associations
@@ -876 +883 @@
         // Call exit if we were the last outstanding child process thread.
         if (apps.size() == 0 && exit == true) {
-        System.exit(0);
+        // In my opinion (DB) there is no need to exit here,
+        // the 'run' method ending naturally brings this
+        // thread to an end.  In fact it is potentially
+        // dangerous to exit here, as the main thread in the
+        // Gatherer class may be stopped prematurely.  As it so
+        // happens the point at which the ExternalApplication thread
+        // is asked to stop (Back in the main Gatherer thread) is after
+        // various configuration files have been saved.
+        // 
+        // A similar argument holds for BrowserApplication thread below.
+        System.exit(exit_status);
         }
     }
@@ -957 +974 @@
         // Call exit if we were the last outstanding child process thread.
         if (apps.size() == 0 && exit == true) {
-        System.exit(0);
+        System.exit(exit_status);
         }
     }

trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

@@ -794 +794 @@
 
         if (restart_required) {
-        Gatherer.exit(2);
+        Gatherer.exit(Gatherer.EXIT_THEN_RESTART);
         }
     }