Merge pull request #37 from javierfreire/unchaught

Fix #36; Avoid uncaught exception on timeout

Author: fleipold

src/main/java/org/buildobjects/process/ByteArrayConsumptionThread.java

@@ -32,8 +32,10 @@ public void run() {
                 try {
                     bytes = toByteArray(inputStream);
                 } catch (Throwable t) {
-                    ByteArrayConsumptionThread.this.throwable = t;
-                    eventSink.dispatch(EXCEPTION_IN_STREAM_HANDLING);
+                    if (!thread.isInterrupted()) {
+                        ByteArrayConsumptionThread.this.throwable = t;
+                        eventSink.dispatch(EXCEPTION_IN_STREAM_HANDLING);
+                    }
                 }
             }
         });

src/main/java/org/buildobjects/process/StreamConsumerConsumptionThread.java

@@ -28,8 +28,10 @@ public void run() {
                     stdout.consume(inputStream);
 
                 } catch (Throwable t) {
-                    StreamConsumerConsumptionThread.this.throwable = t;
-                    eventSink.dispatch(EXCEPTION_IN_STREAM_HANDLING);
+                    if (!thread.isInterrupted()) {
+                        StreamConsumerConsumptionThread.this.throwable = t;
+                        eventSink.dispatch(EXCEPTION_IN_STREAM_HANDLING);
+                    }
                 }
             }
         });

src/main/java/org/buildobjects/process/StreamCopyConsumptionThread.java

@@ -25,11 +25,14 @@ public void startConsumption(final InputStream inputStream) {
             public void run() {
                 try {
                     new StreamCopyRunner(inputStream, stdout, false).run();
-            } catch (Throwable t) {
-                StreamCopyConsumptionThread.this.throwable = t;
-                eventSink.dispatch(EXCEPTION_IN_STREAM_HANDLING);
+                } catch (Throwable t) {
+                    if (!thread.isInterrupted()) {
+                        StreamCopyConsumptionThread.this.throwable = t;
+                        eventSink.dispatch(EXCEPTION_IN_STREAM_HANDLING);
+                    }
+                }
             }
-        }});
+        });
         this.thread.start();
     }