1 files changed, 17 insertions, 9 deletions

diff --git a/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/AwaitTerminationExecutorServiceProvider.java b/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/AwaitTerminationExecutorServiceProvider.java
index 08230335..25bcec37 100644
--- a/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/AwaitTerminationExecutorServiceProvider.java
+++ b/language-web/src/test/java/tools/refinery/language/web/xtext/servlet/AwaitTerminationExecutorServiceProvider.java
@@ -3,7 +3,6 @@ package tools.refinery.language.web.xtext.servlet;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
 
 import org.eclipse.xtext.ide.ExecutorServiceProvider;
 
@@ -11,24 +10,33 @@ import com.google.inject.Singleton;
 
 @Singleton
 public class AwaitTerminationExecutorServiceProvider extends ExecutorServiceProvider {
-        private List<ExecutorService> servicesToShutDown = new ArrayList<>();
+        private List<RestartableCachedThreadPool> servicesToShutDown = new ArrayList<>();
 
         @Override
         protected ExecutorService createInstance(String key) {
-                var instance = super.createInstance(key);
-                servicesToShutDown.add(instance);
+                var instance = new RestartableCachedThreadPool();
+                synchronized (servicesToShutDown) {
+                        servicesToShutDown.add(instance);
+                }
                 return instance;
         }
 
+        public void waitForAllTasksToFinish() {
+                synchronized (servicesToShutDown) {
+                        for (var executorService : servicesToShutDown) {
+                                executorService.waitForAllTasksToFinish();
+                        }
+                }
+        }
+
         @Override
         public void dispose() {
                 super.dispose();
-                for (var executorService : servicesToShutDown) {
-                        try {
-                                executorService.awaitTermination(1, TimeUnit.SECONDS);
-                        } catch (InterruptedException e) {
-                                // Continue normally.
+                synchronized (servicesToShutDown) {
+                        for (var executorService : servicesToShutDown) {
+                                executorService.waitForTermination();
                         }
+                        servicesToShutDown.clear();
                 }
         }
 }