Merge pull request #108 from jglick/NPE-getLastBuiltOn

Illegal to call Jenkins.getNode(null)
jenkinsci · Mar 31, 2015 · c6e0d56 · c6e0d56
2 parents afff105 + 65f799c
commit c6e0d56
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/...ort/src/main/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution.java b/...ort/src/main/java/org/jenkinsci/plugins/workflow/support/steps/ExecutorStepExecution.java
@@ -180,6 +180,9 @@ private Object readResolve() {
         }
 
         @Override public Node getLastBuiltOn() {
+            if (label == null) {
+                return null;
+            }
             Jenkins j = Jenkins.getInstance();
             if (j == null) {
                 return null;