[SECURITY-667] Ensure all tasks have completed before we attain COMPL…

…ETED.
jenkinsci · Dec 13, 2017 · ccc374a · ccc374a
1 parent f670681
commit ccc374a
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/core/src/main/java/jenkins/model/Jenkins.java b/core/src/main/java/jenkins/model/Jenkins.java
@@ -3097,7 +3097,7 @@ public void run(Reactor session) throws Exception {
             });
         }
 
-        g.requires(JOB_LOADED).add("Cleaning up obsolete items deleted from the disk", new Executable() {
+        g.requires(JOB_LOADED).attains(COMPLETED).add("Cleaning up obsolete items deleted from the disk", new Executable() {
             public void run(Reactor reactor) throws Exception {
                 // anything we didn't load from disk, throw them away.
                 // doing this after loading from disk allows newly loaded items
@@ -3112,7 +3112,7 @@ public void run(Reactor reactor) throws Exception {
             }
         });
 
-        g.requires(JOB_LOADED).add("Finalizing set up",new Executable() {
+        g.requires(JOB_LOADED).attains(COMPLETED).add("Finalizing set up",new Executable() {
             public void run(Reactor session) throws Exception {
                 rebuildDependencyGraph();