From f084dd1561650e7808351d933b97204d5f18528d Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Tue, 11 Mar 2008 05:37:33 +0000
Subject: [PATCH] Fixing #1388 in a different way.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@7567 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/src/main/java/hudson/matrix/MatrixBuild.java        | 2 +-
 .../src/main/java/hudson/matrix/MatrixConfiguration.java | 9 +++++++++
 core/src/main/java/hudson/model/AbstractProject.java     | 5 -----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/hudson/matrix/MatrixBuild.java b/core/src/main/java/hudson/matrix/MatrixBuild.java
index 899ba56e1a..0a2e2002a8 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<MatrixProject,MatrixBuild> {
             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 caf36b35b4..3dbde0188a 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<MatrixConfiguration,MatrixRun>
             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 3ed9554996..17f12aafc8 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<P extends AbstractProject<P,R>,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.
      */
-- 
GitLab