Skip to content
Permalink
Browse files

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

  • Loading branch information...
jglick committed May 24, 2016
1 parent 0917e47 commit 7804b661cf9198044dea1ff352770297d2e90911
Showing with 11 additions and 7 deletions.
  1. +11 −7 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();

0 comments on commit 7804b66

Please sign in to comment.
You can’t perform that action at this time.