src: java: add check if need to enable the sorter for DefaultMatrixEx…

…ecutionStrategyImpl 把是否需要排序提取出来，勾选了之后然后可以选择某个排序规则进行排序。
mamh-java · Jul 2, 2020 · 017b506 · 017b506
1 parent 8ca76e1
commit 017b506
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/main/java/hudson/matrix/DefaultMatrixExecutionStrategyImpl.java b/src/main/java/hudson/matrix/DefaultMatrixExecutionStrategyImpl.java
@@ -55,11 +55,22 @@ public class DefaultMatrixExecutionStrategyImpl extends MatrixExecutionStrategy
     private volatile MatrixConfigurationSorter sorter;
 
     @DataBoundConstructor
-    public DefaultMatrixExecutionStrategyImpl(Boolean runSequentially, boolean hasTouchStoneCombinationFilter, String touchStoneCombinationFilter, Result touchStoneResultCondition, MatrixConfigurationSorter sorter) {
+    public DefaultMatrixExecutionStrategyImpl(Boolean runSequentially,
+        boolean hasTouchStoneCombinationFilter, String touchStoneCombinationFilter, Result touchStoneResultCondition,
+        boolean hasSortExecutionbuild, MatrixConfigurationSorter sorter) {
         this(runSequentially!=null ? runSequentially : false,
             hasTouchStoneCombinationFilter ? touchStoneCombinationFilter : null,
             hasTouchStoneCombinationFilter ? touchStoneResultCondition : null,
-            sorter);
+            hasSortExecutionbuild? sorter: null);
+    }
+
+    public DefaultMatrixExecutionStrategyImpl(Boolean runSequentially,
+        boolean hasTouchStoneCombinationFilter, String touchStoneCombinationFilter, Result touchStoneResultCondition,
+        MatrixConfigurationSorter sorter) {
+        this(runSequentially!=null ? runSequentially : false,
+                hasTouchStoneCombinationFilter ? touchStoneCombinationFilter : null,
+                hasTouchStoneCombinationFilter ? touchStoneResultCondition : null,
+                sorter);
     }
 
     public DefaultMatrixExecutionStrategyImpl(boolean runSequentially, String touchStoneCombinationFilter, Result touchStoneResultCondition, MatrixConfigurationSorter sorter) {