1 files changed, 7 insertions, 1 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/TimeoutManagerImpl.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/TimeoutManagerImpl.java
index bb1ffce1c86..d7b652b80f7 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/TimeoutManagerImpl.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/TimeoutManagerImpl.java
@@ -53,7 +53,13 @@ public class TimeoutManagerImpl {
     }
 
     public void shutdown() {
-        done.set(true);
+        synchronized (done) {
+            done.set(true);
+            done.notify();
+        }
+        try {
+            thread.join();
+        } catch (InterruptedException e) {}
     }
 
     public RequestHandler manageHandler(RequestHandler handler) {