[FIXED JENKINS-14330] NPE.

jenkinsci · Jul 5, 2012 · 0d5a132 · 0d5a132
1 parent 129e76b
commit 0d5a132
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/core/src/main/java/hudson/model/Computer.java b/core/src/main/java/hudson/model/Computer.java
@@ -88,6 +88,7 @@
 import java.net.InetAddress;
 import java.net.NetworkInterface;
 import java.net.Inet4Address;
+import javax.annotation.CheckForNull;
 
 import static javax.servlet.http.HttpServletResponse.*;
 
@@ -425,7 +426,7 @@ public String getName() {
      *      null if the configuration has changed and the node is removed, yet the corresponding {@link Computer}
      *      is not yet gone.
      */
-    public Node getNode() {
+    public @CheckForNull Node getNode() {
         if(nodeName==null)
             return Jenkins.getInstance();
         return Jenkins.getInstance().getNode(nodeName);

diff --git a/core/src/main/java/jenkins/model/UnlabeldLoadStatistics.java b/core/src/main/java/jenkins/model/UnlabeldLoadStatistics.java
@@ -48,18 +48,23 @@ public class UnlabeldLoadStatistics extends LoadStatistics {
     @Override
     public int computeIdleExecutors() {
         int r=0;
-        for (Computer c : Jenkins.getInstance().getComputers())
-            if(c.getNode().getMode()== Mode.NORMAL && (c.isOnline() || c.isConnecting()))
+        for (Computer c : Jenkins.getInstance().getComputers()) {
+            Node node = c.getNode();
+            if (node != null && node.getMode() == Mode.NORMAL && (c.isOnline() || c.isConnecting())) {
                 r += c.countIdle();
+            }
+        }
         return r;
     }
 
     @Override
     public int computeTotalExecutors() {
         int r=0;
         for (Computer c : Jenkins.getInstance().getComputers()) {
-            if(c.getNode().getMode()==Mode.NORMAL && c.isOnline())
+            Node node = c.getNode();
+            if (node != null && node.getMode() == Mode.NORMAL && c.isOnline()) {
                 r += c.countExecutors();
+            }
         }
         return r;
     }