From 8bb6d1e5253288ed657466f0b203da8fce66ad20 Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Wed, 11 Jan 2017 13:14:17 +0900 Subject: [PATCH] DRY. --- .../java/com/zaxxer/hikari/pool/HikariPool.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java index 16ce9330..38968a9c 100755 --- a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java +++ b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java @@ -513,8 +513,7 @@ public class HikariPool extends PoolBase implements HikariPoolMXBean, IBagStateL else { final Throwable t = getLastConnectionFailure(); if (t instanceof ConnectionSetupException) { - destroyHouseKeepingExecutorService(); - throw new PoolInitializationException(t.getCause()); + throwPoolInitializationException(t.getCause()); } throwable = t; @@ -523,11 +522,17 @@ public class HikariPool extends PoolBase implements HikariPoolMXBean, IBagStateL } while (elapsedMillis(startTime) < config.getInitializationFailTimeout()); if (config.getInitializationFailTimeout() >= 0) { - destroyHouseKeepingExecutorService(); - throw new PoolInitializationException(throwable); + throwPoolInitializationException(throwable); } } + private void throwPoolInitializationException(Throwable t) + { + LOGGER.error("{} - Exception during pool initialization.", poolName, t); + destroyHouseKeepingExecutorService(); + throw new PoolInitializationException(t); + } + private void softEvictConnection(final PoolEntry poolEntry, final String reason, final boolean owner) { poolEntry.markEvicted();