[FIXED JENKINS-15271] NPE in <code>MatrixProject.onLoad</code>.

jenkinsci · Sep 21, 2012 · 23ade1c · 23ade1c
1 parent ec3005e
commit 23ade1c
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 1 deletion.
diff --git a/changelog.html b/changelog.html
@@ -58,8 +58,12 @@
   <li class=bug>
     Displaying <code>/people</code> can consume huge resources.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15206">issue 15206</a>)
+  <li class=bug>
     Log recorders do not work reliably.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15226">issue 15226</a>)
+  <li class=bug>
+    NPE in <code>MatrixProject.onLoad</code>.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-15271">issue 15271</a>)
   <li class=bug>
     <code>FilePath.validateAntFileMask</code> too slow for <code>/configure</code>.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-7214">issue 7214</a>)

diff --git a/core/src/main/java/hudson/matrix/MatrixProject.java b/core/src/main/java/hudson/matrix/MatrixProject.java
@@ -471,7 +471,7 @@ public void onLoad(ItemGroup<? extends Item> parent, String name) throws IOExcep
         buildWrappers.setOwner(this);
 
         if (executionStrategy ==null)
-            executionStrategy = new DefaultMatrixExecutionStrategyImpl(runSequentially,touchStoneCombinationFilter,touchStoneResultCondition,sorter);
+            executionStrategy = new DefaultMatrixExecutionStrategyImpl(runSequentially != null ? runSequentially : false, touchStoneCombinationFilter, touchStoneResultCondition, sorter);
 
         rebuildConfigurations(null);
     }

diff --git a/test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy b/test/src/test/groovy/hudson/matrix/MatrixProjectTest.groovy
@@ -35,6 +35,7 @@ import org.jvnet.hudson.test.Email
 import org.jvnet.hudson.test.HudsonTestCase
 import org.jvnet.hudson.test.SingleFileSCM
 import org.jvnet.hudson.test.UnstableBuilder
+import org.jvnet.hudson.test.recipes.LocalData;
 import com.gargoylesoftware.htmlunit.html.HtmlTable
 import org.jvnet.hudson.test.Bug
 import org.jvnet.hudson.test.TestBuilder
@@ -431,4 +432,19 @@ public class MatrixProjectTest extends HudsonTestCase {
             //~ assertNotNull(run.getAction(RevisionParameterAction.class));
         //~ }
     //~ }
+
+    @Bug(15271)
+    @LocalData
+    public void testUpgrade() throws Exception {
+        MatrixProject p = jenkins.getItemByFullName("x", MatrixProject.class);
+        assertNotNull(p);
+        MatrixExecutionStrategy executionStrategy = p.getExecutionStrategy();
+        assertEquals(DefaultMatrixExecutionStrategyImpl.class, executionStrategy.getClass());
+        DefaultMatrixExecutionStrategyImpl defaultExecutionStrategy = (DefaultMatrixExecutionStrategyImpl) executionStrategy;
+        assertFalse(defaultExecutionStrategy.isRunSequentially());
+        assertNull(defaultExecutionStrategy.getTouchStoneCombinationFilter());
+        assertNull(defaultExecutionStrategy.getTouchStoneResultCondition());
+        assertNull(defaultExecutionStrategy.getSorter());
+    }
+
 }
diff --git a/test/src/test/resources/hudson/matrix/MatrixProjectTest/testUpgrade/config.xml b/test/src/test/resources/hudson/matrix/MatrixProjectTest/testUpgrade/config.xml
@@ -0,0 +1 @@
+<hudson/>
diff --git a/test/src/test/resources/hudson/matrix/MatrixProjectTest/testUpgrade/jobs/x/config.xml b/test/src/test/resources/hudson/matrix/MatrixProjectTest/testUpgrade/jobs/x/config.xml
@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<matrix-project>
+  <actions/>
+  <description></description>
+  <keepDependencies>false</keepDependencies>
+  <properties/>
+  <scm class="hudson.scm.NullSCM"/>
+  <canRoam>true</canRoam>
+  <disabled>false</disabled>
+  <blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
+  <blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
+  <triggers class="vector"/>
+  <concurrentBuild>false</concurrentBuild>
+  <axes/>
+  <builders/>
+  <publishers/>
+  <buildWrappers/>
+  <!-- somehow not here: <runSequentially>false</runSequentially> -->
+</matrix-project>