Changeset 31664 for main

Timestamp:

2017-05-08T18:32:28+12:00 (7 years ago)

Author:

ak19

Message:

Tabbing for emacs.

File:

• main/trunk/gli/src/org/greenstone/gatherer/util/SafeProcess.java (modified) (16 diffs)

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

@@ -54 +54 @@
     private String inputStr = null;
     private Process process = null;
-    private boolean forciblyTerminateProcess = false;
+    private boolean forciblyTerminateProcess = false;
     
     // output from running SafeProcess.runProcess()
@@ -135 +135 @@
         
         // http://stackoverflow.com/questions/5283444/convert-array-of-strings-into-a-string-in-java
-        //log("SafeProcess running:" + Arrays.toString(command_args));
-        StringBuffer cmdDisplay = new StringBuffer();
-        for(int i = 0; i < command_args.length; i++) {
-            cmdDisplay.append(" ").append(command_args[i]);
-        }
-        log("SafeProcess running: [" + cmdDisplay + "]");
-        cmdDisplay = null; // let the GC have it    
-        
+        //log("SafeProcess running:" + Arrays.toString(command_args));
+        StringBuffer cmdDisplay = new StringBuffer();
+        for(int i = 0; i < command_args.length; i++) {
+        cmdDisplay.append(" ").append(command_args[i]);
+        }
+        log("SafeProcess running: [" + cmdDisplay + "]");
+        cmdDisplay = null; // let the GC have it    
+        
         
         if(this.envp == null) { 
@@ -157 +157 @@
         }
         }
-    }   
+    }
 
     return prcs;
@@ -167 +167 @@
                    SafeProcess.InputStreamGobbler errorGobbler)
     throws IOException, InterruptedException
-    {   
+    {
     // kick off the stream gobblers
     inputGobbler.start();
@@ -203 +203 @@
         errorGobbler.interrupt();
         outputGobbler.interrupt();
-        
-        // Since we have been cancelled (InterruptedException), or on any Exception, we need
-        // to forcibly terminate process eventually after the finally code first waits for each worker thread
-        // to die off. Don't set process=null until after we've forcibly terminated it if needs be.
-        this.forciblyTerminateProcess = true; 
+        
+        // Since we have been cancelled (InterruptedException), or on any Exception, we need
+        // to forcibly terminate process eventually after the finally code first waits for each worker thread
+        // to die off. Don't set process=null until after we've forcibly terminated it if needs be.
+        this.forciblyTerminateProcess = true; 
         
         // even after the interrupts, we want to proceed to calling join() on all the worker threads
@@ -252 +252 @@
     // Run a very basic process: with no reading from or writing to the Process' iostreams,
     // this just execs the process and waits for it to return.
-    // Don't call this method but the zero-argument runProcess() instead if your process will
-    // output stuff to its stderr and stdout streams but you don't need to monitory these.
-    // Because, as per a comment in GLI's GS3ServerThread.java,
-    // in Java 6, it wil block if you don't handle a process' streams when the process is
-    // outputting something. (Java 7+ won't block if you don't bother to handle the output streams)
+    // Don't call this method but the zero-argument runProcess() instead if your process will
+    // output stuff to its stderr and stdout streams but you don't need to monitory these.
+    // Because, as per a comment in GLI's GS3ServerThread.java,
+    // in Java 6, it wil block if you don't handle a process' streams when the process is
+    // outputting something. (Java 7+ won't block if you don't bother to handle the output streams)
     public int runBasicProcess() {
     try {
-        this.forciblyTerminateProcess = true;
+        this.forciblyTerminateProcess = true;
         
         // 1. create the process
@@ -266 +266 @@
         this.exitValue = process.waitFor();
 
-        this.forciblyTerminateProcess = false;
+        this.forciblyTerminateProcess = false;
     } catch(IOException ioe) {      
         
@@ -275 +275 @@
         }
     } catch(InterruptedException ie) {
-        
+
         if(exceptionHandler != null) {
         exceptionHandler.gotException(ie);
@@ -288 +288 @@
         destroyProcess(process); // see runProcess() below      
         }
-        process = null;
-        this.forciblyTerminateProcess = false; // reset
+        process = null;
+        this.forciblyTerminateProcess = false; // reset
     }
     return this.exitValue;
@@ -311 +311 @@
 
     try {
-        this.forciblyTerminateProcess = false;
+        this.forciblyTerminateProcess = false;
         
         // 1. get the Process object
@@ -351 +351 @@
        
     } catch(IOException ioe) {
-        this.forciblyTerminateProcess = true;
+        this.forciblyTerminateProcess = true;
 
         if(exceptionHandler != null) {
@@ -381 +381 @@
         }
         process = null;
-        this.forciblyTerminateProcess = false; // reset
+        this.forciblyTerminateProcess = false; // reset
     }
     
@@ -394 +394 @@
 
     try {
-        this.forciblyTerminateProcess = false;
+        this.forciblyTerminateProcess = false;
         
         // 1. get the Process object
@@ -428 +428 @@
        
     } catch(IOException ioe) {
-        this.forciblyTerminateProcess = true;
+        this.forciblyTerminateProcess = true;
         
         if(exceptionHandler != null) {
@@ -468 +468 @@
         log("*** Have called process.destroy 1");
         }
-        process = null;
-        this.forciblyTerminateProcess = false; //reset      
+        process = null;
+        this.forciblyTerminateProcess = false; //reset      
     }
     
@@ -839 +839 @@
     
     public InputStreamGobbler(InputStream is, boolean split_newlines)
-    {   
+    {
     this(); // sets thread name
     this.is = is;