Waiting for the cache scheduler termination.

rapidoid · Mar 19, 2017 · 59dd626 · 59dd626
1 parent 5ae40eb
commit 59dd626
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/rapidoid-commons/src/main/java/org/rapidoid/cache/Caching.java b/rapidoid-commons/src/main/java/org/rapidoid/cache/Caching.java
@@ -27,6 +27,7 @@
 import org.rapidoid.cache.impl.CacheStats;
 import org.rapidoid.cache.impl.ConcurrentCacheAtomWithStats;
 import org.rapidoid.lambda.Mapper;
+import org.rapidoid.u.U;
 import org.rapidoid.util.LazyInit;
 
 import java.util.concurrent.Callable;
@@ -65,6 +66,8 @@ public static void reset() {
 	}
 
 	public static void shutdown() {
-		scheduler().shutdownNow();
+		ScheduledThreadPoolExecutor scheduler = scheduler();
+		scheduler.shutdownNow();
+		while (!scheduler.isTerminated()) U.sleep(1);
 	}
 }