Merge pull request #271 from Atry/fork-fix

Add synchronized block for mutable builders
ThoughtWorksInc · Jun 21, 2019 · 4e2e1d8 · 4e2e1d8
2 parents 2320db2 + b7a3835
commit 4e2e1d8
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/keywords-Fork/src/main/scala/com/thoughtworks/dsl/keywords/Fork.scala b/keywords-Fork/src/main/scala/com/thoughtworks/dsl/keywords/Fork.scala
@@ -113,15 +113,19 @@ object Fork {
           val element = !ForEach(fork.elements)
           counter.incrementAndGet()
           try {
-            builder ++= !Shift(mapper(element));
-            ()
+            val result = !Shift(mapper(element))
+            builder.synchronized[Unit] {
+              builder ++= result
+            }
           } catch {
             case MultipleException(throwableSet) =>
-              exceptionBuilder ++= throwableSet;
-              ()
+              exceptionBuilder.synchronized[Unit] {
+                exceptionBuilder ++= throwableSet
+              }
             case e: Throwable =>
-              exceptionBuilder += e;
-              ()
+              exceptionBuilder.synchronized[Unit] {
+                exceptionBuilder += e
+              }
           } finally {
             if (counter.decrementAndGet() > 0) {
               !Continue