3 files changed, 42 insertions, 29 deletions

diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java
index 52acee6d..fe4952a9 100644
--- a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/AwaitTerminationExecutorServiceProvider.java
@@ -17,6 +17,13 @@ public class AwaitTerminationExecutorServiceProvider extends ExecutorServiceProv
         private final List<RestartableCachedThreadPool> servicesToShutDown = new ArrayList<>();
 
         @Override
+        public ExecutorService get(String key) {
+                synchronized (servicesToShutDown) {
+                        return super.get(key);
+                }
+        }
+
+        @Override
         protected ExecutorService createInstance(String key) {
                 var instance = new RestartableCachedThreadPool(() -> super.createInstance(key));
                 synchronized (servicesToShutDown) {
@@ -35,8 +42,8 @@ public class AwaitTerminationExecutorServiceProvider extends ExecutorServiceProv
 
         @Override
         public void dispose() {
-                super.dispose();
                 synchronized (servicesToShutDown) {
+                        super.dispose();
                         for (var executorService : servicesToShutDown) {
                                 executorService.waitForTermination();
                         }
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java
index 991ff114..4d55e548 100644
--- a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/RestartableCachedThreadPool.java
@@ -13,29 +13,34 @@ import org.slf4j.LoggerFactory;
 import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicReference;
 
 public class RestartableCachedThreadPool implements ExecutorService {
         private static final Logger LOG = LoggerFactory.getLogger(RestartableCachedThreadPool.class);
 
-        private ExecutorService delegate;
+        private final AtomicReference<ExecutorService> delegate = new AtomicReference<>();
 
         private final Provider<ExecutorService> executorServiceProvider;
 
         public RestartableCachedThreadPool(Provider<ExecutorService> executorServiceProvider) {
                 this.executorServiceProvider = executorServiceProvider;
-                delegate = executorServiceProvider.get();
+                delegate.set(executorServiceProvider.get());
         }
 
         public void waitForAllTasksToFinish() {
-                delegate.shutdown();
-                waitForTermination();
-                delegate = executorServiceProvider.get();
+                var oldDelegate = delegate.getAndSet(executorServiceProvider.get());
+                oldDelegate.shutdown();
+                waitForTermination(oldDelegate);
         }
 
         public void waitForTermination() {
+                waitForTermination(delegate.get());
+        }
+
+        private static void waitForTermination(ExecutorService executorService) {
                 boolean result = false;
                 try {
-                        result = delegate.awaitTermination(10, TimeUnit.SECONDS);
+                        result = executorService.awaitTermination(10, TimeUnit.SECONDS);
                 } catch (InterruptedException e) {
                         LOG.warn("Interrupted while waiting for delegate executor to stop", e);
                 }
@@ -46,70 +51,71 @@ public class RestartableCachedThreadPool implements ExecutorService {
 
         @Override
         public boolean awaitTermination(long arg0, @NotNull TimeUnit arg1) throws InterruptedException {
-                return delegate.awaitTermination(arg0, arg1);
+                return delegate.get().awaitTermination(arg0, arg1);
         }
 
         @Override
         public void execute(@NotNull Runnable arg0) {
-                delegate.execute(arg0);
+                delegate.get().execute(arg0);
         }
 
         @Override
-        public <T> List<Future<T>> invokeAll(@NotNull Collection<? extends Callable<T>> arg0, long arg1,
-                                                                                 @NotNull TimeUnit arg2)
+        public <T> @NotNull List<Future<T>> invokeAll(@NotNull Collection<? extends Callable<T>> arg0, long arg1,
+                                                                                                  @NotNull TimeUnit arg2)
                         throws InterruptedException {
-                return delegate.invokeAll(arg0, arg1, arg2);
+                return delegate.get().invokeAll(arg0, arg1, arg2);
         }
 
         @Override
-        public <T> List<Future<T>> invokeAll(@NotNull Collection<? extends Callable<T>> arg0) throws InterruptedException {
-                return delegate.invokeAll(arg0);
+        public <T> @NotNull List<Future<T>> invokeAll(@NotNull Collection<? extends Callable<T>> arg0)
+                        throws InterruptedException {
+                return delegate.get().invokeAll(arg0);
         }
 
         @Override
         public <T> T invokeAny(@NotNull Collection<? extends Callable<T>> arg0, long arg1, @NotNull TimeUnit arg2)
                         throws InterruptedException, ExecutionException, TimeoutException {
-                return delegate.invokeAny(arg0, arg1, arg2);
+                return delegate.get().invokeAny(arg0, arg1, arg2);
         }
 
         @Override
-        public <T> T invokeAny(@NotNull Collection<? extends Callable<T>> arg0) throws InterruptedException,
+        public <T> @NotNull T invokeAny(@NotNull Collection<? extends Callable<T>> arg0) throws InterruptedException,
                         ExecutionException {
-                return delegate.invokeAny(arg0);
+                return delegate.get().invokeAny(arg0);
         }
 
         @Override
         public boolean isShutdown() {
-                return delegate.isShutdown();
+                return delegate.get().isShutdown();
         }
 
         @Override
         public boolean isTerminated() {
-                return delegate.isTerminated();
+                return delegate.get().isTerminated();
         }
 
         @Override
         public void shutdown() {
-                delegate.shutdown();
+                delegate.get().shutdown();
         }
 
         @Override
-        public List<Runnable> shutdownNow() {
-                return delegate.shutdownNow();
+        public @NotNull List<Runnable> shutdownNow() {
+                return delegate.get().shutdownNow();
         }
 
         @Override
-        public <T> Future<T> submit(@NotNull Callable<T> arg0) {
-                return delegate.submit(arg0);
+        public <T> @NotNull Future<T> submit(@NotNull Callable<T> arg0) {
+                return delegate.get().submit(arg0);
         }
 
         @Override
-        public <T> Future<T> submit(@NotNull Runnable arg0, T arg1) {
-                return delegate.submit(arg0, arg1);
+        public <T> @NotNull Future<T> submit(@NotNull Runnable arg0, T arg1) {
+                return delegate.get().submit(arg0, arg1);
         }
 
         @Override
-        public Future<?> submit(@NotNull Runnable arg0) {
-                return delegate.submit(arg0);
+        public @NotNull Future<?> submit(@NotNull Runnable arg0) {
+                return delegate.get().submit(arg0);
         }
 }
diff --git a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/WebSocketIntegrationTestClient.java b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/WebSocketIntegrationTestClient.java
index d45a9d6b..6ccf1760 100644
--- a/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/WebSocketIntegrationTestClient.java
+++ b/subprojects/language-web/src/test/java/tools/refinery/language/web/tests/WebSocketIntegrationTestClient.java
@@ -18,7 +18,7 @@ import java.util.List;
 import static org.junit.jupiter.api.Assertions.fail;
 
 public abstract class WebSocketIntegrationTestClient {
-        private static final long TIMEOUT_MILLIS = Duration.ofSeconds(30).toMillis();
+        private static final long TIMEOUT_MILLIS = Duration.ofSeconds(10).toMillis();
 
         private boolean finished = false;