diff --git a/core/src/main/java/hudson/matrix/MatrixBuild.java b/core/src/main/java/hudson/matrix/MatrixBuild.java index 899ba56e1a7e37d332e9583287c933dbb749f24b..0a2e2002a8e934413b9d99bc0c897d5187f8d4f4 100644 --- a/core/src/main/java/hudson/matrix/MatrixBuild.java +++ b/core/src/main/java/hudson/matrix/MatrixBuild.java @@ -128,7 +128,7 @@ public class MatrixBuild extends AbstractBuild { try { for(MatrixConfiguration c : activeConfigurations) { logger.println(Messages.MatrixBuild_Triggering(c.getName())); - c.scheduleBuild(0); // start with no delay + c.scheduleBuild(); } // this occupies an executor unnecessarily. diff --git a/core/src/main/java/hudson/matrix/MatrixConfiguration.java b/core/src/main/java/hudson/matrix/MatrixConfiguration.java index caf36b35b47c9ab873708921f889ab5228b3d2c0..3dbde0188aa84bfaefb8e9f518baa2c7edcea849 100644 --- a/core/src/main/java/hudson/matrix/MatrixConfiguration.java +++ b/core/src/main/java/hudson/matrix/MatrixConfiguration.java @@ -124,6 +124,15 @@ public class MatrixConfiguration extends Project return ws.child(getCombination().toString('/','/')); } + /** + * Since {@link MatrixConfiguration} is always invoked from {@link MatrixRun} + * once and just once, there's no point in having a quiet period. + */ + @Override + public int getQuietPeriod() { + return 0; + } + @Override public boolean isConfigurable() { return false; diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 3ed955499651fb53ee2277314d938babf495fc59..17f12aafc8195f97a0102875a27333b60a45380d 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -347,11 +347,6 @@ public abstract class AbstractProject

,R extends A return Hudson.getInstance().getQueue().add(this); } - public boolean scheduleBuild(int quietPeriod) { - if(isDisabled()) return false; - return Hudson.getInstance().getQueue().add(this,quietPeriod); - } - /** * Schedules a polling of this project. */