JENKINS-25894 fix could throw an IllegalArgumentException under some …

…conditions.
jenkinsci · Oct 18, 2016 · 72bba7f · 72bba7f
1 parent 5c91c7c
commit 72bba7f
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/org/jenkinsci/plugins/workflow/cps/steps/ParallelStep.java b/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);
             }