From e2f1974dc9ca381dbcb2f10792e422282475be48 Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Sat, 30 Jan 2016 21:44:18 +0900 Subject: [PATCH] Add null check. --- src/main/java/com/zaxxer/hikari/pool/HikariPool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java index ebe6e8d8..f7a06189 100644 --- a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java +++ b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java @@ -216,7 +216,7 @@ public class HikariPool extends PoolBase implements HikariPoolMXBean, IBagStateL addConnectionExecutor.shutdown(); addConnectionExecutor.awaitTermination(5L, TimeUnit.SECONDS); - if (config.getScheduledExecutorService() == null) { + if (config.getScheduledExecutorService() == null && houseKeepingExecutorService != null) { houseKeepingExecutorService.shutdown(); houseKeepingExecutorService.awaitTermination(5L, TimeUnit.SECONDS); }