From ebe5868fd119951814c1ae0dbf37c200b5ebbcc7 Mon Sep 17 00:00:00 2001
From: Nitin <nitinchauhan@hotmail.com>
Date: Fri, 14 Aug 2015 20:02:55 +0530
Subject: [PATCH] changes as suggested align log stats

---
 .../java/com/zaxxer/hikari/pool/HikariPool.java | 17 +++++++----------
 .../pool/PoolInitializationException.java       |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
index 39e14ed9..e67517b2 100644
--- a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
+++ b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
@@ -203,7 +203,7 @@ public class HikariPool implements HikariPoolMXBean, IBagStateListener
          suspendResumeLock.release();
       }
 
-      logPoolState("Timeout failure ");
+      logPoolState("Timeout failure\t");
       String sqlState = null;
       final Throwable originalException = lastConnectionFailure.getAndSet(null);
       if (originalException instanceof SQLException) {
@@ -241,7 +241,7 @@ public class HikariPool implements HikariPoolMXBean, IBagStateListener
          poolState = POOL_SHUTDOWN;
 
          LOGGER.info("{} - is closing down.", poolName);
-         logPoolState("Before closing ");
+         logPoolState("Before closing\t");
 
          connectionBag.close();
          softEvictConnections();
@@ -271,7 +271,7 @@ public class HikariPool implements HikariPoolMXBean, IBagStateListener
          closeConnectionExecutor.awaitTermination(5L, TimeUnit.SECONDS);
       }
       finally {
-         logPoolState("After closing ");
+         logPoolState("After closing\t");
 
          poolElf.unregisterMBeans();
          metricsTracker.close();
@@ -526,7 +526,7 @@ public class HikariPool implements HikariPoolMXBean, IBagStateListener
          addConnectionExecutor.execute(new Runnable() {
             @Override
             public void run() {
-               logPoolState("After fill ");
+               logPoolState("After fill\t");
             }
          });
       }
@@ -631,14 +631,11 @@ public class HikariPool implements HikariPoolMXBean, IBagStateListener
             previous = now;
          }
 
-         logPoolState("Before cleanup ");
+         logPoolState("Before cleanup\t");
          final List<PoolBagEntry> bag = connectionBag.values(STATE_NOT_IN_USE);
          int removable = bag.size() - config.getMinimumIdle();
          for (PoolBagEntry bagEntry : bag) {
-            if (removable <= 0) {
-               break;
-            }
-            if (connectionBag.reserve(bagEntry)) {
+            if (removable > 0 && connectionBag.reserve(bagEntry)) {
                if (idleTimeout > 0L && clockSource.elapsedMillis(bagEntry.lastAccess, now) > idleTimeout) {
                   closeConnection(bagEntry, "(connection passed idleTimeout)");
                   removable--;
@@ -649,7 +646,7 @@ public class HikariPool implements HikariPoolMXBean, IBagStateListener
             }
          }
          
-         logPoolState("After cleanup ");
+         logPoolState("After cleanup\t");
 
          fillPool(); // Try to maintain minimum connections
       }
diff --git a/src/main/java/com/zaxxer/hikari/pool/PoolInitializationException.java b/src/main/java/com/zaxxer/hikari/pool/PoolInitializationException.java
index 4e0c8770..a6d1d25d 100644
--- a/src/main/java/com/zaxxer/hikari/pool/PoolInitializationException.java
+++ b/src/main/java/com/zaxxer/hikari/pool/PoolInitializationException.java
@@ -31,6 +31,6 @@ public class PoolInitializationException extends RuntimeException
     */
    public PoolInitializationException(Throwable t)
    {
-      super(t);
+      super("Exception during pool initialization: " + t.getMessage(), t);
    }
 }