Merge pull request #258 from dwnusbaum/synchronization-fix

Try to fix synchronization in `SemaphoreStep`
jenkinsci · Mar 29, 2024 · 175aa9c · 175aa9c
2 parents 1e84e32 + 5f06b21
commit 175aa9c
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/test/java/org/jenkinsci/plugins/workflow/test/steps/SemaphoreStep.java b/src/test/java/org/jenkinsci/plugins/workflow/test/steps/SemaphoreStep.java
@@ -189,13 +189,16 @@ public static class Execution extends AbstractStepExecutionImpl {
             Object returnValue = null;
             Throwable error = null;
             boolean success = false, failure = false, sync = true;
+            String c = Jenkins.XSTREAM.toXML(getContext());
             synchronized (s) {
                 if (s.returnValues.containsKey(k)) {
                     success = true;
                     returnValue = s.returnValues.get(k);
                 } else if (s.errors.containsKey(k)) {
                     failure = true;
                     error = s.errors.get(k);
+                } else {
+                    s.contexts.put(k, c);
                 }
             }
             if (success) {
@@ -206,10 +209,6 @@ public static class Execution extends AbstractStepExecutionImpl {
                 getContext().onFailure(error);
             } else {
                 LOGGER.info(() -> "Blocking " + k);
-                String c = Jenkins.XSTREAM.toXML(getContext());
-                synchronized (s) {
-                    s.contexts.put(k, c);
-                }
                 sync = false;
             }
             synchronized (s) {