Changeset 29361 for main/trunk/gli/src/org/greenstone/gatherer/Gatherer.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/Gatherer.java (modified) (2 diffs)

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

@@ -744 +744 @@
                 p = Runtime.getRuntime().exec(new String[]{"/bin/bash", "-c", "ant stop -f \"" + Configuration.gsdl3_src_path + File.separator + "build.xml\""});
             }
-            if(p != null && p.waitFor() == 0) {
+            // doing a p.waitFor() without processing the Process' IOstreams causes blocking with Java 6 
+            // (i.e. when JRE 6 included with GS binaries). However, p.waitFor() with Java 7 is fine.
+            /*if(p != null && p.waitFor() == 0) {
                 DebugStream.println("********** SUCCESSFULLY stopped THE GS3 SERVER ON EXIT");
             }
@@ -750 +752 @@
                 System.err.println("********** FAILED TO SUCCESSFULLY stop THE GS3 SERVER ON EXIT");
                 //throw new Exception ("Failed to successfully stop the GS3 server on exit.");
-            }
+            }*/
             } catch(Exception e) {
             System.err.println("Exception when trying to stop the tomcat web server: " + e);