From dcf817608f38694fa932f3ab9d7b621d2908716f Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Sat, 14 Aug 2021 11:28:54 -0700 Subject: [PATCH] Devin thinks it would make more sense to call this at the end of the method rather than the start so that the exception is updated before `context.onFailure(t)` is called in the superclass. --- .../jenkinsci/plugins/workflow/steps/TimeoutStepExecution.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jenkinsci/plugins/workflow/steps/TimeoutStepExecution.java b/src/main/java/org/jenkinsci/plugins/workflow/steps/TimeoutStepExecution.java index 6605bfaf..d1cabcce 100644 --- a/src/main/java/org/jenkinsci/plugins/workflow/steps/TimeoutStepExecution.java +++ b/src/main/java/org/jenkinsci/plugins/workflow/steps/TimeoutStepExecution.java @@ -265,7 +265,6 @@ private class Callback extends BodyExecutionCallback.TailCall { @Override public void onFailure(StepContext context, Throwable t) { - super.onFailure(context, t); if (t instanceof FlowInterruptedException) { /* * Check whether the FlowInterruptedException has propagated past the corresponding @@ -289,6 +288,7 @@ public void onFailure(StepContext context, Throwable t) { } } } + super.onFailure(context, t); } private static final long serialVersionUID = 1L;