Changeset 29361 for main/trunk/gli/src/org/greenstone/gatherer/util/GS3ServerThread.java

Timestamp:

2014-10-10T16:59:53+13:00 (10 years ago)

Author:

ak19

Message:

Fix to recent commit that made GS3ServerThread.java do a Process.waitFor(). JRE6 is included in GS binaries. But Java 6 does not work with Process.WaitFor() in GS3ServerThread, as the GS3 server waits to start until after GLI has been quit. Java 7 (JDK and JRE 7) work fine with this. To get Java 6 to work, need to handle the IOstreams of the Process launched by GS3ServerThread. Using the StreamGobbler classes for this.

File:

• main/trunk/gli/src/org/greenstone/gatherer/util/GS3ServerThread.java (modified) (1 diff)

main/trunk/gli/src/org/greenstone/gatherer/util/GS3ServerThread.java

@@ -78 +78 @@
 
         if (p != null) {
-            int result = p.waitFor();
-            if(result != 0) {
+            // in order for the process.waitFor() method to work with Java 6 (JRE 6 is included in GS binaries)
+            // need to make sure the IOstreams of the process are not blocked. For Java 7, this is not necessary
+            // and a waitFor() is sufficient. But with Java 6, the waitFor() causes the server to finally start
+            // after the user has quit GLI.
+        
+            // Process takes no input, but we will still catch this iostream too
+            // And we'll catch the error and output streams to prevent them from blocking during waitFor()
+            // (For normal input and output stream handling using the Gobblers, see FormatConversionDialog.java)
+            OutputStreamGobbler inputGobbler = new OutputStreamGobbler(p.getOutputStream(), null);          
+            InputStreamGobbler errorGobbler = new InputStreamGobbler(p.getErrorStream(), true);
+            InputStreamGobbler outputGobbler = new InputStreamGobbler(p.getInputStream());
+            
+            errorGobbler.start();
+            outputGobbler.start();
+            inputGobbler.start();
+            
+            // the important part: wait for the process (ant stop or start or re-start to terminate)
+            int result = p.waitFor();
+            if(result != 0) {
             System.err.println("**** Failed to successfully " + _ant_command + " the GS3 server.");
-            }
+            }       
+            
+            outputGobbler.join();
+            errorGobbler.join();
+            inputGobbler.join();
         } else {
             System.err.println("**** Could not start the Process to " + _ant_command + " the GS3 server.");