Change how autoCommit and transaction isolation are reset

pull/22/merge
Brett Wooldridge 11 years ago
parent 847b03cf3e
commit 5811ed149b

@ -404,14 +404,24 @@ public final class HikariPool implements HikariPoolMBean
connection.setAutoCommit(isAutoCommit); connection.setAutoCommit(isAutoCommit);
connection.setTransactionIsolation(transactionIsolation); connection.setTransactionIsolation(transactionIsolation);
if (jdbc4ConnectionTest) try
{ {
return connection.isValid((int) TimeUnit.MILLISECONDS.toSeconds(timeoutMs)); if (jdbc4ConnectionTest)
{
return connection.isValid((int) TimeUnit.MILLISECONDS.toSeconds(timeoutMs));
}
try (Statement statement = connection.createStatement())
{
statement.executeQuery(configuration.getConnectionTestQuery());
}
} }
finally
try (Statement statement = connection.createStatement())
{ {
statement.executeQuery(configuration.getConnectionTestQuery()); if (!isAutoCommit)
{
connection.commit();
}
} }
return true; return true;

Loading…
Cancel
Save