Changeset 29361 for main/trunk/gli/src/org/greenstone/gatherer/util/OutputStreamGobbler.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/OutputStreamGobbler.java (modified) (1 diff)

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

@@ -51 +51 @@
     public void run()
     {
+    
+    if (inputstr == null) {
+        return;
+    }
+    
     BufferedWriter osw = null;
     try {