Changeset 22691 for main

Timestamp:

2010-08-19T19:09:20+12:00 (14 years ago)

Author:

ak19

Message:

Cleaner exit when the client tries to a remote greenstone server that is not running (first noticed when the greenstone version is requested).

Location:

main/trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (1 diff)
• remote/RemoteGreenstoneServer.java (modified) (1 diff)

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

@@ -334 +334 @@
         // Display the version to make error reports a lot more useful
         System.err.println("Remote Greenstone server version: " + greenstoneVersion);
+        if(greenstoneVersion == -1) { // remote server not running
+            Gatherer.exit();
+        }
         if(greenstoneVersion >= 3) {
             this.GS3 = true;

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

@@ -195 +195 @@
         result = result.substring(index+1).trim(); // skip the space after colon, must remove surrounding spaces
     }
-    int greenstoneVersion = Integer.parseInt(result);
+    // if space is returned, then the request failed (the server may not have been running)
+    int greenstoneVersion = result.equals("") ? -1 : Integer.parseInt(result);
     return greenstoneVersion;
     }