From 06e459fffebfe447dcd3edad73559ffb4a8ae707 Mon Sep 17 00:00:00 2001
From: Jesse Glick <jglick@cloudbees.com>
Date: Tue, 23 Apr 2013 20:21:01 -0400
Subject: [PATCH] [FIXED JENKINS-17728] ParentBuildAction.parent can sometimes
 be null.

---
 changelog.html                                            | 3 +++
 core/src/main/java/hudson/matrix/MatrixConfiguration.java | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changelog.html b/changelog.html
index 456e5786b0..e3949d2bc5 100644
--- a/changelog.html
+++ b/changelog.html
@@ -60,6 +60,9 @@ Upcoming changes</a>
   <li class=bug>
     Third-party license display for core was broken since 1.506.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17724">issue 17724</a>)
+  <li class=bug>
+    NPE from <code>MatrixConfiguration.newBuild</code>.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-17728">issue 17728</a>)
   <li class=rfe>
     <code>/about</code> now links to license information for plugins as well.
   <li class=rfe>
diff --git a/core/src/main/java/hudson/matrix/MatrixConfiguration.java b/core/src/main/java/hudson/matrix/MatrixConfiguration.java
index 66516a0e33..b1c56409be 100644
--- a/core/src/main/java/hudson/matrix/MatrixConfiguration.java
+++ b/core/src/main/java/hudson/matrix/MatrixConfiguration.java
@@ -232,7 +232,10 @@ public class MatrixConfiguration extends Project<MatrixConfiguration,MatrixRun>
         MatrixBuild lb = getParent().getLastBuild();
         for (Action a : actions) {
             if (a instanceof ParentBuildAction) {
-                lb = ((ParentBuildAction) a).parent;
+                MatrixBuild _lb = ((ParentBuildAction) a).parent;
+                if (_lb != null) {
+                    lb = _lb;
+                }
             }
         }