Merge pull request #23 from ederst/master

[JENKINS-24059] Fixed NullPointerException on missing downstream project
jenkinsci · Aug 11, 2014 · 39c6e9f · 39c6e9f
2 parents 36165db + 1f35437
commit 39c6e9f
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/main/java/com/sonyericsson/jenkins/plugins/bfa/model/FailureCauseBuildAction.java b/src/main/java/com/sonyericsson/jenkins/plugins/bfa/model/FailureCauseBuildAction.java
@@ -342,7 +342,16 @@ private static void adjustProjectDisplayName(
 
         for (DownstreamBuildFinder dbf : DownstreamBuildFinder.getAll()) {
 
-            foundDbf.addAll(dbf.getDownstreamBuilds(build));
+            List<AbstractBuild<?, ?>> downstreamBuilds = dbf.getDownstreamBuilds(build);
+
+            for (AbstractBuild<?, ?> downstreamBuild : downstreamBuilds) {
+                if (downstreamBuild != null) {
+                    foundDbf.add(downstreamBuild);
+                } else {
+                    logger.log(Level.FINER, "[BFA] Ignoring missing downstream build for " + build.getFullDisplayName());
+                }
+            }
+
         }
         return foundDbf;
     }