Changeset 19003 for gli/trunk/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java

Timestamp:

2009-04-16T12:43:08+12:00 (15 years ago)

Author:

ak19

Message:

Fixed a bug I introduced into the functioning of GLI with Windows' Local Library Server when writing the code for GLI working with Linux' local server: testServerRunning() method now throws an exception rather than processing it itself. This exception is once again handled by start() the way it used to, whereas checkServerRunning() deals with such an exception differently.

File:

• gli/trunk/src/org/greenstone/gatherer/greenstone/LocalLibraryServer.java (modified) (4 diffs)

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

@@ -200 +200 @@
     
     // Wait until program has started
-    testServerRunning(); // will set running = true when the server is up and running successfully
+    try {
+        testServerRunning(); // will set running = true when the server is up and running successfully
+    } catch (IOException bad_url_connection) {
+        try {
+        // If this fails then we try changing the url to be localhost
+        Configuration.library_url = new URL(llssite_cfg_file.getLocalHostURL());
+        DebugStream.println("Try connecting to server on local host: '" + Configuration.library_url + "'");
+        URLConnection connection = Configuration.library_url.openConnection();
+        connection.getContent();
+        running = true;
+        
+        } catch (IOException worse_url_connection) {
+        DebugStream.println("Can't connect to server on either address.");
+        Configuration.library_url = null;
+        running = false;
+        }
+    }
     }
 
@@ -273 +289 @@
     // This method first tests whether there is a URL in the llssite_cfg_file 
     // and after that appears, it tests whether the URL is functional.
-    static private void testServerRunning() {
+    static private void testServerRunning() throws IOException {
     // Wait until program has started, by reloading and checking the URL field
     llssite_cfg_file.load(false);
@@ -305 +321 @@
         URLConnection connection = Configuration.library_url.openConnection();
         connection.getContent();
+        running = true;
     }
     catch (IOException bad_url_connection) {
-        try {
-        // If this fails then we try changing the url to be localhost
-        Configuration.library_url = new URL(llssite_cfg_file.getLocalHostURL());
-        DebugStream.println("Try connecting to server on local host: '" + Configuration.library_url + "'");
-        URLConnection connection = Configuration.library_url.openConnection();
-        connection.getContent();
-        
-        }
-        catch (IOException worse_url_connection) {
-        DebugStream.println("Can't connect to server on either address.");
-        Configuration.library_url = null;
-        return;
-        }
-    }
-
-    running = true;
+        throw bad_url_connection;
+    }
+
+    
     }
 
@@ -345 +350 @@
         running = false;
         Gatherer.spawnApplication(local_library_server_command, ID);
-        testServerRunning(); // don't return until the webserver is up and running
+        try {
+        testServerRunning(); // don't return until the webserver is up and running
+        } catch (IOException bad_url_connection) {
+        DebugStream.println("Can't connect to server on address " + Configuration.library_url);
+        running = false;
+        }
     }
     }