Skip to content
Permalink
Browse files

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

…39134

[JENKINS-40909] NPE encountered during tests
  • Loading branch information
jglick committed Jan 10, 2017
2 parents bea88ca + 26a6f48 commit b62cb6a4e01cf3ee32c8ff7e03dee9bd625ca08e
@@ -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();
}

@@ -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();
}

0 comments on commit b62cb6a

Please sign in to comment.
You can’t perform that action at this time.