Commits

James Dumay committed 565a983

ExternalProcess could not be interrupted because it ignored InterruptedException

  • Participants
  • Parent commits e8784d7

Comments (0)

Files changed (1)

src/main/java/com/atlassian/utils/process/ExternalProcess.java

                     awaitPump(outputPump, checkTime);
                     awaitPump(inputPump, checkTime);
                     awaitPump(errorPump, checkTime);
-                } while (!isTimedOut() && arePumpsRunning());
+                } while (!isTimedOut() && arePumpsRunning() && !Thread.currentThread().isInterrupted());
+
+                if (Thread.currentThread().isInterrupted() && arePumpsRunning()) {
+                    cancel();
+                }
             } finally {
                 int exitCode = 0;
                 if (!cancelled) {
     private int wrapUpProcess() {
         int exitCode = -1;
         boolean processIncomplete = true;
+        boolean interrupted = false;
         try {
             exitCode = process.exitValue();
             processIncomplete = false;
                     exitCode = process.exitValue();
                     processIncomplete = false;
                 } catch (InterruptedException e1) {
-                    // just ignore
+                    processIncomplete = true;
+                    interrupted = true;
+                    break;
                 } catch (IllegalThreadStateException e2) {
                     // ignore and try in the next loop
                 }
             }
         } finally {
-            process.destroy();
-        }
-
-        // make sure pumps are done
-        if (arePumpsRunning()) {
             cancel();
         }
 
-        if (processIncomplete) {
+        if (processIncomplete && !interrupted) {
             processException = new ProcessTimeoutException("process timed out");
         }
         return exitCode;