Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[JENKINS-40909] NPE encountered during tests.
  • Loading branch information
jglick committed Jan 9, 2017
1 parent bea88ca commit 26a6f48
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
Expand Up @@ -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();
}

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

Expand Down

0 comments on commit 26a6f48

Please sign in to comment.