JENKINS-13722: Fixed problem that broke unrelated matrix builds.

jenkinsci · May 24, 2012 · cd25ecd · cd25ecd
1 parent dc32ad2
commit cd25ecd
Showing 1 changed file with 16 additions and 6 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/vSphereCloudRunListener.java b/src/main/java/org/jenkinsci/plugins/vSphereCloudRunListener.java
@@ -10,6 +10,8 @@
 import hudson.model.listeners.RunListener;
 import hudson.Extension;
 import hudson.model.AbstractBuild;
+import hudson.model.Computer;
+import hudson.model.Executor;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -29,12 +31,20 @@ public vSphereCloudRunListener() {
     @Override
     public void onStarted(Run r, TaskListener listener) {
         super.onStarted(r, listener);
-        Node node = r.getExecutor().getOwner().getNode();
-        if (node instanceof vSphereCloudSlave) {
-            LimitedRuns.add(r);
-            vSphereCloudSlave s = (vSphereCloudSlave)node;
-            s.StartLimitedTestRun(r, listener);
-        }        
+        if (r != null) {
+            Executor exec = r.getExecutor();
+            if (exec != null) {
+                Computer owner = exec.getOwner();
+                if (owner != null) {
+                    Node node = owner.getNode();
+                    if ((node != null) && (node instanceof vSphereCloudSlave)) {
+                        LimitedRuns.add(r);
+                        vSphereCloudSlave s = (vSphereCloudSlave)node;
+                        s.StartLimitedTestRun(r, listener);
+                    }
+                }
+            }
+        }
     }
 
     @Override