Merge pull request #95 from jglick/AbstractStepExecutionImpl-JENKINS-…

…39134 [JENKINS-40909] NPE encountered during tests
jenkinsci · Jan 10, 2017 · b62cb6a · b62cb6a
2 parents bea88ca + 26a6f48
commit b62cb6a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepAtomNode.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepAtomNode.java
@@ -64,7 +64,9 @@ public StepAtomNode(CpsFlowExecution exec, StepDescriptor d, FlowNode parent) {
     }
 
     protected Object readResolve() throws ObjectStreamException {
-        this.descriptorId = this.descriptorId.intern();
+        if (descriptorId != null) {
+            this.descriptorId = this.descriptorId.intern();
+        }
         return super.readResolve();
     }
 

diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepStartNode.java b/src/main/java/org/jenkinsci/plugins/workflow/cps/nodes/StepStartNode.java
@@ -40,7 +40,9 @@ public StepDescriptor getDescriptor() {
     }
 
     protected Object readResolve() throws ObjectStreamException {
-        this.descriptorId = this.descriptorId.intern();
+        if (descriptorId != null) {
+            this.descriptorId = this.descriptorId.intern();
+        }
         return super.readResolve();
     }