[JENKINS-73726] Avoid NPE trying to cancel a block which is already done

jenkinsci · Sep 5, 2024 · 27eb8b8 · 27eb8b8
1 parent 3761c26
commit 27eb8b8
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java b/plugin/src/main/java/org/jenkinsci/plugins/workflow/cps/CpsBodyExecution.java
@@ -249,6 +249,9 @@ public boolean cancel(Throwable error) {
             t.getExecution().runInCpsVmThread(new FutureCallback<>() {
                 @Override
                 public void onSuccess(CpsThreadGroup g) {
+                    if (thread == null) {
+                        return;
+                    }
                     // Similar to getCurrentExecutions but we want the raw CpsThread, not a StepExecution; cf. CpsFlowExecution.interrupt
                     Map<FlowHead, CpsThread> m = new LinkedHashMap<>();
                     for (CpsThread t : thread.group.getThreads()) {