Merge pull request #438 from nitincchauhan/dev

removed isClosed() check.
pull/445/head
Brett Wooldridge 10 years ago
commit 5553fe5dcf

@ -173,8 +173,7 @@ public class HikariPool extends PoolBase implements HikariPoolMXBean, IBagStateL
metricsTracker.recordBorrowStats(poolEntry, startTime);
return poolEntry.createProxyConnection(leakTask.start(poolEntry), now);
}
}
while (timeout > 0L);
} while (timeout > 0L);
}
catch (InterruptedException e) {
throw new SQLException(poolName + " - Interrupted during connection acquisition", e);
@ -227,8 +226,7 @@ public class HikariPool extends PoolBase implements HikariPoolMXBean, IBagStateL
do {
softEvictConnections();
abortActiveConnections(assassinExecutor);
}
while (getTotalConnections() > 0 && clockSource.elapsedMillis(start) < TimeUnit.SECONDS.toMillis(5));
} while (getTotalConnections() > 0 && clockSource.elapsedMillis(start) < TimeUnit.SECONDS.toMillis(5));
} finally {
assassinExecutor.shutdown();
assassinExecutor.awaitTermination(5L, TimeUnit.SECONDS);

@ -100,7 +100,7 @@ abstract class PoolBase
void quietlyCloseConnection(final Connection connection, final String closureReason)
{
try {
if (connection == null || connection.isClosed()) {
if (connection == null) {
return;
}
@ -133,10 +133,10 @@ abstract class PoolBase
if (isNetworkTimeoutSupported != TRUE) {
setQueryTimeout(statement, (int) TimeUnit.MILLISECONDS.toSeconds(validationTimeout));
}
statement.execute(config.getConnectionTestQuery());
}
if (isIsolateInternalQueries && !isReadOnly && !isAutoCommit) {
connection.rollback();
}
@ -466,6 +466,7 @@ abstract class PoolBase
if (sql != null) {
try (Statement statement = connection.createStatement()) {
//con created few ms before, set query timeout is omitted
statement.execute(sql);
if (!isReadOnly) {

Loading…
Cancel
Save