Merge pull request #1724 from oleg-nenashev/AbstractProject_construct…

…or_NPE [FIXED JENKINS-28654] - Check null nodes condition in AbstractProject constructor
jenkinsci · Jun 7, 2015 · 695a3d7 · 695a3d7
2 parents 29f223a + a7ec87c
commit 695a3d7
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java
@@ -266,7 +266,9 @@ protected AbstractProject(ItemGroup parent, String name) {
         buildMixIn = createBuildMixIn();
         builds = buildMixIn.getRunMap();
 
-        if(Jenkins.getInstance()!=null && !Jenkins.getInstance().getNodes().isEmpty()) {
+        final Jenkins j = Jenkins.getInstance();
+        final List<Node> nodes = j != null ? j.getNodes() : null;
+        if(nodes!=null && !nodes.isEmpty()) {
             // if a new job is configured with Hudson that already has slave nodes
             // make it roamable by default
             canRoam = true;