diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 76af5d8900..34d7f0653a 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -1410,28 +1410,32 @@ public abstract class AbstractProject

,R extends A if (!isBuildable()) throw HttpResponses.error(SC_INTERNAL_SERVER_ERROR,new IOException(getFullName()+" is not buildable")); - String delay = req.getParameter("delay"); - if (delay!=null) { - try { - // TODO: more unit handling - if(delay.endsWith("sec")) delay=delay.substring(0,delay.length()-3); - if(delay.endsWith("secs")) delay=delay.substring(0,delay.length()-4); - Hudson.getInstance().getQueue().schedule(this, Integer.parseInt(delay), - new CauseAction(cause)); - } catch (NumberFormatException e) { - throw new ServletException("Invalid delay parameter value: "+delay); - } - } else { - scheduleBuild(cause); - } + Hudson.getInstance().getQueue().schedule(this, getDelay(req), new CauseAction(cause)); rsp.forwardToPreviousPage(req); } + /** + * Computes the delay by taking the default value and the override in the request parameter into the account. + */ + public int getDelay(StaplerRequest req) throws ServletException { + String delay = req.getParameter("delay"); + if (delay==null) return getQuietPeriod(); + + try { + // TODO: more unit handling + if(delay.endsWith("sec")) delay=delay.substring(0,delay.length()-3); + if(delay.endsWith("secs")) delay=delay.substring(0,delay.length()-4); + return Integer.parseInt(delay); + } catch (NumberFormatException e) { + throw new ServletException("Invalid delay parameter value: "+delay); + } + } + /** * Supports build trigger with parameters via an HTTP GET or POST. * Currently only String parameters are supported. */ - public void doBuildWithParameters(StaplerRequest req, StaplerResponse rsp) throws IOException { + public void doBuildWithParameters(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException { BuildAuthorizationToken.checkPermission(this, authToken, req, rsp); ParametersDefinitionProperty pp = getProperty(ParametersDefinitionProperty.class); diff --git a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java index 3d1aa6a830..a03391eede 100644 --- a/core/src/main/java/hudson/model/ParametersDefinitionProperty.java +++ b/core/src/main/java/hudson/model/ParametersDefinitionProperty.java @@ -132,8 +132,8 @@ public class ParametersDefinitionProperty extends JobProperty values = new ArrayList(); for (ParameterDefinition d: parameterDefinitions) { ParameterValue value = d.createValue(req); @@ -145,7 +145,7 @@ public class ParametersDefinitionProperty extends JobProperty