[JENKINS-13619] - Committed missing changes

Signed-off-by: Oleg Nenashev <o.v.nenashev@gmail.com> Conflicts: src/main/java/hudson/plugins/throttleconcurrents/ThrottleQueueTaskDispatcher.java
jenkinsci · May 17, 2014 · 610834a · 610834a
1 parent 739c4a7
commit 610834a
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/main/java/hudson/plugins/throttleconcurrents/ThrottleQueueTaskDispatcher.java b/src/main/java/hudson/plugins/throttleconcurrents/ThrottleQueueTaskDispatcher.java
@@ -95,6 +95,13 @@ public CauseOfBlockage canRun(Queue.Item item) {
         return null;
     }
 
+    private ThrottleMatrixProjectOptions getMatrixOptions(Task task) {
+        ThrottleJobProperty tjp = getThrottleJobProperty(task);
+        if (tjp == null) return ThrottleMatrixProjectOptions.DEFAULT;       
+        ThrottleMatrixProjectOptions matrixOptions = tjp.getMatrixOptions();
+        return matrixOptions != null ? matrixOptions : ThrottleMatrixProjectOptions.DEFAULT;
+    }
+
     private boolean shouldBeThrottled(Task task, ThrottleJobProperty tjp) {
        if (tjp == null) return false;
        if (!tjp.getThrottleEnabled()) return false;
@@ -191,8 +198,14 @@ private int buildsOfProjectOnNode(Node node, Task task) {
             for (Executor e : computer.getExecutors()) {
                 runCount += buildsOnExecutor(task, e);
             }
-            ThrottleJobProperty tjp = getThrottleJobProperty(task);
-            if (task instanceof MatrixConfiguration &&  !tjp.getThrottleConfiguration()){
+
+            ThrottleMatrixProjectOptions matrixOptions = getMatrixOptions(task);
+            if ( matrixOptions.isThrottleMatrixBuilds() && task instanceof MatrixProject) {
+                for (Executor e : computer.getOneOffExecutors()) {
+                    runCount += buildsOnExecutor(task, e);
+                }
+            }
+            if ( matrixOptions.isThrottleMatrixConfigurations() && task instanceof MatrixConfiguration) {
                 for (Executor e : computer.getOneOffExecutors()) {
                     runCount += buildsOnExecutor(task, e);
                 }