Merge pull request #53 from christ66/JENKINS-23749

[FIXED Jenkins-23749] NPE when view contains no builds.
jenkinsci · Sep 7, 2014 · 59780cb · 59780cb
2 parents b6a01ad + c57f33f
commit 59780cb
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView.java b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView.java
@@ -393,8 +393,16 @@ public boolean hasDownstreamProjects(final AbstractProject<?, ?> currentProject)
      * @return - Representation of the projects and their related builds making up the build pipeline view
      */
     public BuildPipelineForm getBuildPipelineForm() {
+        if (noOfDisplayedBuilds == null) {
+          return null;
+        }
+
         final int maxNoOfDisplayBuilds = Integer.valueOf(noOfDisplayedBuilds);
 
+        if (gridBuilder == null)  {
+          return null;
+        }
+
         final ProjectGrid project = gridBuilder.build(this);
         if (project.isEmpty()) {
             return null;