From 80a2442d960443f2dbf790479fd809f0dba9fef3 Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Sat, 24 Jan 2015 15:38:28 +0900
Subject: [PATCH] timeoutMs parameter no longer needed with addition of
 validationTimeout

---
 .../main/java/com/zaxxer/hikari/pool/BaseHikariPool.java   | 7 +++----
 .../src/main/java/com/zaxxer/hikari/pool/HikariPool.java   | 2 +-
 .../src/main/java/com/zaxxer/hikari/pool/HikariPool.java   | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/hikaricp-common/src/main/java/com/zaxxer/hikari/pool/BaseHikariPool.java b/hikaricp-common/src/main/java/com/zaxxer/hikari/pool/BaseHikariPool.java
index 62494690..69cee2d3 100644
--- a/hikaricp-common/src/main/java/com/zaxxer/hikari/pool/BaseHikariPool.java
+++ b/hikaricp-common/src/main/java/com/zaxxer/hikari/pool/BaseHikariPool.java
@@ -186,7 +186,7 @@ public abstract class BaseHikariPool implements HikariPoolMBean, IBagStateListen
             }
 
             final long now = System.currentTimeMillis();
-            if (bagEntry.evicted || (now - bagEntry.lastAccess > ALIVE_BYPASS_WINDOW && !isConnectionAlive(bagEntry.connection, timeout))) {
+            if (bagEntry.evicted || (now - bagEntry.lastAccess > ALIVE_BYPASS_WINDOW && !isConnectionAlive(bagEntry.connection))) {
                closeConnection(bagEntry); // Throw away the dead connection and try again
                timeout = connectionTimeout - elapsedTimeMs(start);
             }
@@ -380,7 +380,7 @@ public abstract class BaseHikariPool implements HikariPoolMBean, IBagStateListen
             }
             
             final boolean timeoutEnabled = (connectionTimeout != Integer.MAX_VALUE);
-            final long timeoutMs = timeoutEnabled ? Math.max(250L, connectionTimeout) : 0L;
+            final long timeoutMs = timeoutEnabled ? Math.max(1000L, connectionTimeout) : 0L;
             final int originalTimeout = poolUtils.getAndSetNetworkTimeout(connection, timeoutMs);
             
             transactionIsolation = (transactionIsolation < 0 ? connection.getTransactionIsolation() : transactionIsolation);
@@ -431,10 +431,9 @@ public abstract class BaseHikariPool implements HikariPoolMBean, IBagStateListen
     * Check whether the connection is alive or not.
     *
     * @param connection the connection to test
-    * @param timeoutMs the timeout before we consider the test a failure
     * @return true if the connection is alive, false if it is not alive or we timed out
     */
-   protected abstract boolean isConnectionAlive(final Connection connection, final long timeoutMs);
+   protected abstract boolean isConnectionAlive(final Connection connection);
 
    /**
     * Attempt to abort() active connections on Java7+, or close() them on Java6.
diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
index fcb344df..827b956c 100644
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
@@ -139,7 +139,7 @@ public final class HikariPool extends BaseHikariPool
     * @return true if the connection is alive, false if it is not alive or we timed out
     */
    @Override
-   protected boolean isConnectionAlive(final Connection connection, final long timeoutMs)
+   protected boolean isConnectionAlive(final Connection connection)
    {
       try {
          final int timeoutSec = (int) TimeUnit.MILLISECONDS.toSeconds(validationTimeout);
diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
index 274e44f6..7a81b5ec 100644
--- a/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
@@ -122,7 +122,7 @@ public final class HikariPool extends BaseHikariPool
     * @return true if the connection is alive, false if it is not alive or we timed out
     */
    @Override
-   protected boolean isConnectionAlive(final Connection connection, final long timeoutMs)
+   protected boolean isConnectionAlive(final Connection connection)
    {
       try {
          int timeoutSec = (int) TimeUnit.MILLISECONDS.toSeconds(validationTimeout);