Slightly kinder, gentler shutdown.

10 years ago · ea1c2c590a
parent a0eaaf7a43
commit ea1c2c590a
1 changed files with 2 additions and 1 deletions
--- a/hikaricp-common/src/main/java/com/zaxxer/hikari/pool/BaseHikariPool.java
+++ b/hikaricp-common/src/main/java/com/zaxxer/hikari/pool/BaseHikariPool.java
@ -241,8 +241,9 @@ public abstract class BaseHikariPool implements HikariPoolMBean, IBagStateListen
         logPoolState("Before shutdown ");
         connectionBag.close();
         softEvictConnections();
-         houseKeepingExecutorService.shutdownNow();
+         houseKeepingExecutorService.shutdown();
         addConnectionExecutor.shutdown();
+         houseKeepingExecutorService.awaitTermination(5L, TimeUnit.SECONDS);
         addConnectionExecutor.awaitTermination(5L, TimeUnit.SECONDS);

         final long start = System.currentTimeMillis();