Skip to content
Permalink
Browse files
[FIX JENKINS-12994] Quiet period is blocking other jobs in queue
Queue#maintain() was returning too soon(cherry picked from commit 394e9d6)

Conflicts:

	core/src/main/java/hudson/model/Queue.java
  • Loading branch information
Vlatombe authored and vjuranek committed May 23, 2012
1 parent feddca2 commit 210e50fc8547c99d66b033787371dae115f03b7e
Showing with 2 additions and 1 deletion.
  1. +2 −1 core/src/main/java/hudson/model/Queue.java
@@ -943,11 +943,12 @@ public synchronized void maintain() {
}
}

// 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;

0 comments on commit 210e50f

Please sign in to comment.