Merge pull request #95 from NitorCreations/fix_timeout_calculation

Fix timeout calculation when skipping unusable connections from pool
11 years ago · 8534a62050
parent 884a5fb220 4c238613b0
commit 8534a62050
2 changed files with 2 additions and 2 deletions
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
@ -170,7 +170,7 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener

            if (now > connection.getExpirationTime() || (now - connection.getLastAccess() > 1000L && !isConnectionAlive(connection, timeout))) {
               closeConnection(connection); // Throw away the dead connection and try again
-               timeout -= elapsedTimeMs(start);
+               timeout = connectionTimeout - elapsedTimeMs(start);
               continue;
            }
            else if (leakDetectionThreshold != 0) {
--- a/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
@ -169,7 +169,7 @@ public final class HikariPool implements HikariPoolMBean, IBagStateListener

            if (now > connection.getExpirationTime() || (now - connection.getLastAccess() > 1000L && !isConnectionAlive(connection, timeout))) {
               closeConnection(connection); // Throw away the dead connection and try again
-               timeout -= elapsedTimeMs(start);
+               timeout = connectionTimeout - elapsedTimeMs(start);
               continue;
            }
            else if (leakDetectionThreshold != 0) {