Changeset 33403

Timestamp:

2019-08-12T15:07:23+12:00 (4 years ago)

Author:

ak19

Message:

Mistake to do with launchdir in SafeProcess: if the environment for the process to be executed is null, it does not follow that the launchdir for that process would be null. Ought to handle the params separately.

Location:

main/trunk

Files:

• gli/src/org/greenstone/gatherer/util/SafeProcess.java (modified) (1 diff)
• greenstone3/src/java/org/greenstone/util/SafeProcess.java (modified) (1 diff)

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

@@ -305 +305 @@
         
         
-        if(this.envp == null) { 
+        if(this.envp == null && this.dir == null) { 
         prcs = rt.exec(this.command_args);
-        } else { // launch process using cmd str with env params        
-
+        } else { // launch process using cmd str with env params and/or exec-dir
+
+        //if(this.envp != null) {
         //log("Environment: ");
         //for(int i = 0; i < envp.length; i++) {
         //    log("\t" + envp[i]);
+        //}
         //}
 

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

@@ -280 +280 @@
         
         
-        if(this.envp == null) { 
+        if(this.envp == null && this.dir == null) { 
         prcs = rt.exec(this.command_args);
-        } else { // launch process using cmd str with env params        
+        } else { // launch process using cmd str with env params and/or exec-dir
         
         if(this.dir == null) {