Add null check.

pull/566/head
Brett Wooldridge 9 years ago
parent 69dbe20cff
commit e2f1974dc9

@ -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);
}

Loading…
Cancel
Save