[JENKINS-34450] Backport jenkinsci/workflow-job-plugin#2 to 1.14.x line.

jenkinsci · May 24, 2016 · 7804b66 · 7804b66
1 parent 0917e47
commit 7804b66
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/job/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java b/job/src/main/java/org/jenkinsci/plugins/workflow/job/WorkflowRun.java
@@ -226,13 +226,17 @@ private AsynchronousExecution sleep() {
                 if (forShutdown) {
                     return;
                 }
-                try {
-                    execution.interrupt(Result.ABORTED);
-                } catch (Exception x) {
-                    LOGGER.log(Level.WARNING, null, x);
-                }
-                getExecutor().recordCauseOfInterruption(WorkflowRun.this, listener);
-                printLater("term", "Click here to forcibly terminate running steps");
+                Timer.get().submit(new Runnable() {
+                    @Override public void run() {
+                        try {
+                            execution.interrupt(Result.ABORTED);
+                        } catch (Exception x) {
+                            LOGGER.log(Level.WARNING, null, x);
+                        }
+                        getExecutor().recordCauseOfInterruption(WorkflowRun.this, listener);
+                        printLater("term", "Click here to forcibly terminate running steps");
+                    }
+                });
             }
             @Override public boolean blocksRestart() {
                 return execution.blocksRestart();