Changeset 13779

Timestamp:

2007-01-24T11:43:02+13:00 (17 years ago)

Author:

mdewsnip

Message:

Now reads the output of config commands sent to the local library server, to ensure they are finished.

File:

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

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

@@ -52 +52 @@
     {
     config(ADD_COMMAND + collection_name);
-    // This is very important -- it ensures that the above command has finished
-    config("");
     }
 
 
     // Used to send messages to the local library
-    // Warning: this has a lot of potential for nasty race conditions
-    // The response code is returned immediately -- but this does not mean the local
-    //   library action has finished!
     static private void config(String command)
     {
@@ -71 +66 @@
         URL url = new URL(Configuration.library_url.toString() + command);
         HttpURLConnection library_connection = (HttpURLConnection) url.openConnection();
+
+        // It's very important that we read the output of the command
+        // This ensures that the command has actually finished
+        // (The response code is returned immediately)
+        InputStream library_is = library_connection.getInputStream();
+        BufferedReader library_in = new BufferedReader(new InputStreamReader(library_is, "UTF-8"));
+        String library_output_line = library_in.readLine();
+        while (library_output_line != null) {
+        DebugStream.println("Local library server output: " + library_output_line);
+        library_output_line = library_in.readLine();
+        }
+        library_in.close();
+
         int response_code = library_connection.getResponseCode();
         if (response_code >= HttpURLConnection.HTTP_OK && response_code < HttpURLConnection.HTTP_MULT_CHOICE) {
@@ -79 +87 @@
         }
     }
-    catch (Exception ex) {
-        DebugStream.printStackTrace(ex);
+    catch (Exception exception) {
+        DebugStream.printStackTrace(exception);
     }
     }
@@ -93 +101 @@
     }
 
+
     static public void releaseCollection(String collection_name)
     {
     config(RELEASE_COMMAND + collection_name);
-    // This is very important -- it ensures that the above command has finished
-    config("");
-
-    // !! HACK: Wait a couple of seconds, in the hope that this will reduce the "could not delete index" errors
-    new OneSecondWait();
-    new OneSecondWait();
     }