Merge pull request #419 from Vlatombe/jenkins-12994

[FIX JENKINS-12994] Quiet period is blocking other jobs in queue
jenkinsci · Mar 29, 2012 · e4abef2 · e4abef2
2 parents 51f1c0b + 07b3f2c
commit e4abef2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/changelog.html b/changelog.html
@@ -55,7 +55,9 @@
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
-  <li class=>
+  <li class=bug>
+    Quiet period is blocking other jobs in queue.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-12994">issue 12994</a>)  
 </ul>
 </div><!--=TRUNK-END=-->
 

diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java
@@ -910,12 +910,12 @@ public synchronized void maintain() {
             }
         }
 
-        // waitingList -> buldable/blocked
+        // waitingList -> buildable/blocked
         while (!waitingList.isEmpty()) {
             WaitingItem top = peek();
 
             if (!top.timestamp.before(new GregorianCalendar()))
-                return; // finished moving all ready items from queue
+                break; // finished moving all ready items from queue
 
             waitingList.remove(top);
             Task p = top.task;