[FIXED JENKINS-31614] Avoid acquiring the Queue lock while holding ot…

…her locks. Originally-Committed-As: c89a054375f4e58947e9926d0be74abc5174a478
jenkinsci · Jan 5, 2016 · 6648bd9 · 6648bd9
1 parent f94cf64
commit 6648bd9
Showing 1 changed file with 5 additions and 1 deletion.
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
@@ -474,7 +474,11 @@ private String key() {
                     listener = new StreamBuildListener(new NullStream());
                 }
                 completed = new AtomicBoolean();
-                Queue.getInstance().schedule(new AfterRestartTask(this), 0);
+                Timer.get().submit(new Runnable() { // JENKINS-31614
+                    @Override public void run() {
+                        Queue.getInstance().schedule(new AfterRestartTask(WorkflowRun.this), 0);
+                    }
+                });
             }
         }
         checkouts(null); // only for diagnostics