Changeset 6049

Timestamp:

2003-11-28T17:54:51+13:00 (20 years ago)

Author:

jmt12

Message:

Removed the commented out deadlocking code, and ensured the correct status was returned when a process is cancelled

File:

• trunk/gli/src/org/greenstone/gatherer/shell/GShell.java (modified) (3 diffs)

trunk/gli/src/org/greenstone/gatherer/shell/GShell.java

@@ -81 +81 @@
     /** Element in status type enumeration. */
     static final public int OK = 1;
+    static final public int CANCELLED = 2;
     /** Element in process type name enumeration. */
     static public String GSHELL_BUILD = "gshell_build";
@@ -239 +240 @@
         }
 
-        /** This causes Phind to deadlock
-        String eline = null;
-        String stdinline = null;
-        while ((( eline = ebr.readLine()) != null || (stdinline = stdinbr.readLine()) != null) && !hasSignalledStop()) {
-        if(eline != null) {
-            System.err.print("*");
-            if(progress != null) {
-            progress.parse(eline);
-            }
-            if(bos != null) {
-            try {
-                bos.write(eline.getBytes(), 0, eline.length());
-            }
-            catch(Exception error) {
-                Gatherer.printStackTrace(error);
-            }
-            }
-            fireMessage(type, typeAsString(type) + "> " + eline, status);
-        }
-        if(stdinline != null) {
-            System.err.print("+");
-            fireMessage(type, typeAsString(type) + "> " + stdinline, status);
-        }
-        }
-        */
-
         if(!hasSignalledStop()) {
         // Now display final message based on exit value
@@ -284 +259 @@
         prcs.getOutputStream().close();
         prcs.destroy();
-        status = ERROR;
+        status = CANCELLED;
         }
     }