github-forks
/
HikariCP
mirror of https://github.com/brettwooldridge/HikariCP.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix timeout calculation when skipping unusable connections from pool

Browse Source
pull/95/head
Jonas Berlin 11 years ago
parent ed9c5cad01
commit 4c238613b0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

2
hikaricp-java6/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
Unescape Escape View File

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

2
hikaricp/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save