Changeset 31718 for main/trunk/greenstone3

Timestamp:

2017-05-31T18:05:11+12:00 (7 years ago)

Author:

ak19

Message:

Two more instances in GLI's Gatherer.java were using Java's Process instead of going through SafeProcess. I had a note in the tickets about this, but it was obscured by being an item in my todo list that was ticked off, because I hadn't originally intended to change these 2 instances to use SafeProcess, because SafeProcess didn't have a cancel feature back then. With the recent addition of the cancel feature, the changes became straightforward. Both remaining instances in Gatherer have been changed to use SafeProcess and it's tested on Linux. Updated the SafeProcess README.

File:

• main/trunk/greenstone3/src/java/org/greenstone/util/SafeProcess.java (modified) (3 diffs)

main/trunk/greenstone3/src/java/org/greenstone/util/SafeProcess.java

@@ -163 +163 @@
      * This method returns a boolean that you can call sentInterrupt.  
      */
-    public boolean cancelRunningProcess() { 
+    public boolean cancelRunningProcess() {
 
     boolean forceWaitUntilInterruptible = true;
@@ -922 +922 @@
     */
     
-    if(pid == -1) {
+    if(pid == -1) { // if the process has already terminated, or we can't get the pid for any reason:
         p.destroy(); // at minimum. Will have no effect if the process had already terminated 
     } else {
@@ -930 +930 @@
         if(!killUnixProcessWithID(pid, !forceKill, killEntireProcessTree)) { // send sig TERM (kill -15 or kill -TERM)
         killUnixProcessWithID(pid, forceKill, killEntireProcessTree); // send sig KILL (kill -9 or kill -KILL)
-        }       
+        }
+        // if both kill commands failed for whatever reason, can still at least end the top level process:
+        p.destroy(); // no effect if the process has already terminated.    
     }