From 19cdcb0ee0c549e1c0c7bf32c28ad98362977248 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Thu, 24 Jul 2008 21:32:06 +0000 Subject: [PATCH] Quiet period implementation is changed to work like what most people would expect. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@11009 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/Queue.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/model/Queue.java b/core/src/main/java/hudson/model/Queue.java index 0b52d2c9a1..63f9c5a37f 100644 --- a/core/src/main/java/hudson/model/Queue.java +++ b/core/src/main/java/hudson/model/Queue.java @@ -297,11 +297,21 @@ public class Queue extends ResourceController { return false; WaitingItem wi = (WaitingItem) item; - if (wi.timestamp.before(due)) - return false; // no double queueing - // allow the due date to be pulled in - wi.timestamp = due; + if(quietPeriod<=0) { + // the user really wants to build now, and they mean NOW. + // so let's pull in the timestamp if we can. + if (wi.timestamp.after(due)) + wi.timestamp = due; + else + return false; + } else { + // otherwise we do the normal quiet period implementation + if (wi.timestamp.before(due)) + wi.timestamp = due; // quiet period timer reset. start the period over again + else + return false; + } } else { LOGGER.fine(p.getName() + " added to queue"); -- GitLab