Fixes #465 fix apparent leak of one connection leak at startup when m…

…inimumIdle=0 ... the connection is not leaked, but the ProxyLeakTask was not cancelled.
brettwooldridge · Oct 21, 2015 · 37b96f1 · 37b96f1
1 parent 755f2da
commit 37b96f1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
@@ -252,11 +252,14 @@ public final synchronized void shutdown() throws InterruptedException
    /**
     * Evict a connection from the pool.
     *
-    * @param proxyConnection the connection to evict
+    * @param connection the connection to evict
     */
-   public final void evictConnection(Connection proxyConnection)
+   public final void evictConnection(Connection connection)
    {
-      softEvictConnection(((ProxyConnection) proxyConnection).getPoolEntry(), "(connection evicted by user)", true /* owner */);
+      ProxyConnection proxyConnection = (ProxyConnection) connection;
+      proxyConnection.cancelLeakTask();
+
+      softEvictConnection(proxyConnection.getPoolEntry(), "(connection evicted by user)", true /* owner */);
    }
 
    public void setMetricRegistry(Object metricRegistry)

diff --git a/src/main/java/com/zaxxer/hikari/pool/ProxyConnection.java b/src/main/java/com/zaxxer/hikari/pool/ProxyConnection.java
@@ -133,16 +133,14 @@ final int getNetworkTimeoutState()
    }
 
    // ***********************************************************************
-   //                      IHikariConnectionProxy methods
+   //                          Internal methods
    // ***********************************************************************
 
-   /** {@inheritDoc} */
    final PoolEntry getPoolEntry()
    {
       return poolEntry;
    }
 
-   /** {@inheritDoc} */
    final SQLException checkException(final SQLException sqle)
    {
       final String sqlState = sqle.getSQLState();
@@ -165,13 +163,11 @@ final SQLException checkException(final SQLException sqle)
       return sqle;
    }
 
-   /** {@inheritDoc} */
    final void untrackStatement(final Statement statement)
    {
       openStatements.remove(statement);
    }
 
-   /** {@inheritDoc} */
    final void markCommitStateDirty()
    {
       if (isAutoCommit) {
@@ -182,9 +178,13 @@ final void markCommitStateDirty()
       }
    }
 
-   // ***********************************************************************
+   /**
-   //                        Internal methods
+    * 
-   // ***********************************************************************
+    */
+   void cancelLeakTask()
+   {
+      leakTask.cancel();
+   }
 
    private final <T extends Statement> T trackStatement(final T statement)
    {