From 58c8a9393fbe31e4533343229603cae47723cc6e Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Tue, 13 Aug 2013 21:39:16 -0400
Subject: [PATCH] [FIXED JENKINS-19135] Permit a user to configure an axis with
 no values without throwing exceptions. The project cannot be usefully built
 in this case but at least they can go back and reconfigure it. Also fixing
 Layouter.Column to not throw NoSuchElementException (in violation of Iterator
 contract) and thus break project overview when there is an empty Axis in the
 trivial list (due to an unintentional IndexOutOfBoundsException).

---
 changelog.html                                 | 3 +++
 core/src/main/java/hudson/matrix/Axis.java     | 5 +++--
 core/src/main/java/hudson/matrix/Layouter.java | 7 +++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/changelog.html b/changelog.html
index 0dbcac118b..8c7f69a1d3 100644
--- a/changelog.html
+++ b/changelog.html
@@ -55,6 +55,9 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    Ungraceful handling of empty matrix project axes.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-19135">issue 19135</a>)
   <li class=bug>
     A malformed JUnit result file should mark that test suite as a failure, but not interrupt archiving of other tests.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-19186">issue 19186</a>)
diff --git a/core/src/main/java/hudson/matrix/Axis.java b/core/src/main/java/hudson/matrix/Axis.java
index c776f6ad04..faec4501e1 100644
--- a/core/src/main/java/hudson/matrix/Axis.java
+++ b/core/src/main/java/hudson/matrix/Axis.java
@@ -76,10 +76,11 @@ public class Axis extends AbstractDescribableImpl<Axis> implements Comparable<Ax
     public final List<String> values;
 
     public Axis(String name, List<String> values) {
+        if (values == null || values.isEmpty()) {
+            values = Collections.emptyList();
+        }
         this.name = name;
         this.values = new ArrayList<String>(values);
-        if(values.isEmpty())
-            throw new IllegalArgumentException(); // bug in the code
     }
 
     public Axis(String name, String... values) {
diff --git a/core/src/main/java/hudson/matrix/Layouter.java b/core/src/main/java/hudson/matrix/Layouter.java
index 941a38de10..051b8f6239 100644
--- a/core/src/main/java/hudson/matrix/Layouter.java
+++ b/core/src/main/java/hudson/matrix/Layouter.java
@@ -201,8 +201,11 @@ public abstract class Layouter<T> {
             buildMap(xp,x);
             buildMap(yp,y);
             buildMap(zp,z);
-            for (Axis a : trivial)
-                m.put(a.name,a.value(0));
+            for (Axis a : trivial) {
+                if (a.size() > 0) {
+                    m.put(a.name, a.value(0));
+                }
+            }
             return getT(new Combination(m));
         }
 
-- 
GitLab