Changeset 4397

Timestamp:

2003-05-29T11:02:00+12:00 (21 years ago)

Author:

jmt12

Message:

Forgot to increment attempt counter for server.exe close down so attempt never timed out.

File:

• trunk/gli/src/org/greenstone/gatherer/Gatherer.java (modified) (1 diff)

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

@@ -712 +712 @@
 
     private void stopServerEXE() {
-    // See if its already exited for some reason.
-    gsdlsite_cfg.load();
-    if(gsdlsite_cfg.getURL() != null) {
-        // Send the command for it to exit.
-        Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.QUIT_COMMAND);
-        // Wait until it exits.
-        try {
-        gsdlsite_cfg.load();
-        int try_again = JOptionPane.YES_OPTION;
-        while(try_again == JOptionPane.YES_OPTION) {
-            int count = 0;
-            while(gsdlsite_cfg.getURL() != null && count < 60) {
-            synchronized(this) {
-                wait(1000);
+    if(server != null) {
+        // See if its already exited for some reason.
+        gsdlsite_cfg.load();
+        if(gsdlsite_cfg.getURL() != null) {
+        // Send the command for it to exit.
+        Gatherer.g_man.preview_pane.configServer(GSDLSiteConfig.QUIT_COMMAND);
+        // Wait until it exits.
+        try {
+            gsdlsite_cfg.load();
+            int try_again = JOptionPane.YES_OPTION;
+            while(try_again == JOptionPane.YES_OPTION) {
+            int attempt_count = 0;
+            while(gsdlsite_cfg.getURL() != null && attempt_count < 60) {
+                synchronized(this) {
+                wait(1000); // Wait one second (give or take)
+                }
+                gsdlsite_cfg.load();
+                attempt_count++;
             }
-            gsdlsite_cfg.load();
+            if(attempt_count == 60) {
+                try_again = JOptionPane.showConfirmDialog(Gatherer.g_man, dictionary.get("Server.QuitTimeOut"), dictionary.get("General.Warning"), JOptionPane.YES_NO_OPTION);
+            }
+            else {
+                try_again = JOptionPane.NO_OPTION;
+            }
             }
-            if(count == 60) {
-            try_again = JOptionPane.showConfirmDialog(Gatherer.g_man, dictionary.get("Server.QuitTimeOut"), dictionary.get("General.Warning"), JOptionPane.YES_NO_OPTION);
+            if(gsdlsite_cfg.getURL() != null) {
+            JOptionPane.showMessageDialog(Gatherer.g_man, dictionary.get("Server.QuitManual"), dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
             }
-            else {
-            try_again = JOptionPane.NO_OPTION;
-            }
-        }
-        if(gsdlsite_cfg.getURL() != null) {
-            JOptionPane.showMessageDialog(Gatherer.g_man, dictionary.get("Server.QuitManual"), dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
-        }
-        }
-        catch (Exception error) {
-        error.printStackTrace();
-        }
-    }
-    // Restore the gsdlsite_cfg.
-    if(gsdlsite_cfg != null) {
-        gsdlsite_cfg.restore();
-    }
-    // If the local server is still running then our changed values will get overwritten.
-    if(gsdlsite_cfg.getURL() != null) {
-        JOptionPane.showMessageDialog(Gatherer.g_man, dictionary.get("Server.QuitFailed"), dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
-    }
-    gsdlsite_cfg = null;
+        }
+        catch (Exception error) {
+            error.printStackTrace();
+        }
+        }
+        // Restore the gsdlsite_cfg.
+        if(gsdlsite_cfg != null) {
+        gsdlsite_cfg.restore();
+        }
+        // If the local server is still running then our changed values will get overwritten.
+        if(gsdlsite_cfg.getURL() != null) {
+        JOptionPane.showMessageDialog(Gatherer.g_man, dictionary.get("Server.QuitFailed"), dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
+        }
+        gsdlsite_cfg = null;
+        server = null;
+    }
     }