Changeset 31586

Timestamp:

2017-04-06T21:16:02+12:00 (7 years ago)

Author:

ak19

Message:

Exceptions are now no longer handled by SafeProcess at all times, but only if no exception hander was registered.

File:

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

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

@@ -184 +184 @@
        
     } catch(IOException ioe) {
-        //logger.error("IOexception: " + ioe.getMessage(), ioe);
-        System.err.println("IOexception " + ioe.getMessage());
-        ioe.printStackTrace();
-        if(exceptionHandler != null) exceptionHandler.gotException(ioe);
+        if(exceptionHandler != null) {
+        exceptionHandler.gotException(ioe);
+        } else {
+        //logger.error("IOexception: " + ioe.getMessage(), ioe);
+        System.err.println("IOexception " + ioe.getMessage());
+        ioe.printStackTrace();
+        }
     } catch(InterruptedException ie) {
-        //logger.error("Process InterruptedException: " + ie.getMessage(), ie);
-        System.err.println("Process InterruptedException " + ie.getMessage());
-        ie.printStackTrace();
-
-        if(exceptionHandler != null) exceptionHandler.gotException(ie);
+        if(exceptionHandler != null) {
+        exceptionHandler.gotException(ie);
+        } else {
+        //logger.error("Process InterruptedException: " + ie.getMessage(), ie);
+        System.err.println("Process InterruptedException " + ie.getMessage());
+        //ie.printStackTrace(); // an interrupt here is not an error, it can be a cancel action
+        }
+
 
         // propagate interrupts to worker threads here?
@@ -311 +317 @@
         }
     } catch (IOException ioe) {
-        //logger.error("Exception when reading from a process' stdout/stderr stream: ", ioe);
-        //ioe.printStackTrace();
-
-        if(lineByLineHandler != null) lineByLineHandler.gotException(ioe);      
+        if(lineByLineHandler != null) {
+        lineByLineHandler.gotException(ioe);
+        } else {
+        //logger.error("Exception when reading from a process' stdout/stderr stream: ", ioe);
+        ioe.printStackTrace();
+        }
         
     } finally {
@@ -377 +385 @@
         */
     } catch (IOException ioe) {
-        //logger.error("Exception writing to SafeProcess' inputstream: ", ioe);     
-        ioe.printStackTrace();
-
-        if (this.exceptionHandler != null) this.exceptionHandler.gotException(ioe);
+        if (this.exceptionHandler != null) {
+        this.exceptionHandler.gotException(ioe);
+        } else {
+        //logger.error("Exception writing to SafeProcess' inputstream: ", ioe);     
+        ioe.printStackTrace();
+        }       
         
     } finally {