Skip to content
Permalink
Browse files

JENKINS-25894 fix could throw an IllegalArgumentException under some …

…conditions.
  • Loading branch information...
jglick committed Oct 18, 2016
1 parent 5c91c7c commit 72bba7fced5610643be235e7f8cb7d91720ca93e
Showing with 4 additions and 1 deletion.
  1. +4 −1 src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java
@@ -126,7 +126,10 @@ public void onFailure(StepContext context, Throwable t) {
if (handler.originalFailure == null) {
handler.originalFailure = new SimpleEntry<String, Throwable>(name, t);
} else {
handler.originalFailure.getValue().addSuppressed(t);
Throwable originalT = handler.originalFailure.getValue();
if (t != originalT) { // could be the same abort being delivered across branches
originalT.addSuppressed(t);
}
}
checkAllDone(true);
}

0 comments on commit 72bba7f

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