removed old call

pull/440/head
Nitin 10 years ago
parent c37a6cb20a
commit 285157c335

@ -227,7 +227,8 @@ public class HikariPool extends PoolBase implements HikariPoolMXBean, IBagStateL
softEvictConnections(); softEvictConnections();
abortActiveConnections(assassinExecutor); abortActiveConnections(assassinExecutor);
} while (getTotalConnections() > 0 && clockSource.elapsedMillis(start) < TimeUnit.SECONDS.toMillis(5)); } while (getTotalConnections() > 0 && clockSource.elapsedMillis(start) < TimeUnit.SECONDS.toMillis(5));
} finally { }
finally {
assassinExecutor.shutdown(); assassinExecutor.shutdown();
assassinExecutor.awaitTermination(5L, TimeUnit.SECONDS); assassinExecutor.awaitTermination(5L, TimeUnit.SECONDS);
} }

@ -198,6 +198,9 @@ public abstract class ProxyConnection implements Connection
} }
catch (SQLException e) { catch (SQLException e) {
checkException(e); checkException(e);
if (delegate == ClosedConnection.CLOSED_CONNECTION) {
break; //connection closed in checkException
}
} }
} }
@ -220,7 +223,6 @@ public abstract class ProxyConnection implements Connection
leakTask.cancel(); leakTask.cancel();
try { try {
closeStatements();
if (isCommitStateDirty && !isAutoCommit) { if (isCommitStateDirty && !isAutoCommit) {
delegate.rollback(); delegate.rollback();
lastAccess = clockSource.currentTime(); lastAccess = clockSource.currentTime();

Loading…
Cancel
Save