Selective merge of dev changes.

brettwooldridge · May 7, 2015 · dbdc196 · dbdc196
1 parent 84a0b48
commit dbdc196
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/com/zaxxer/hikari/pool/HikariPool.java b/src/main/java/com/zaxxer/hikari/pool/HikariPool.java
@@ -194,7 +194,7 @@ public final Connection getConnection(final long hardTimeout) throws SQLExceptio
             else {
                metricsContext.setConnectionLastOpen(bagEntry, now);
                metricsContext.stop();
-               return ProxyFactory.getProxyConnection(this, bagEntry, leakTask.start(bagEntry));
+               return ProxyFactory.getProxyConnection(this, bagEntry, leakTask.start(bagEntry), now);
             }
          }
          while (timeout > 0L);

diff --git a/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java b/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java
@@ -72,13 +72,13 @@ public abstract class ConnectionProxy implements IHikariConnectionProxy
       SQL_ERRORS.add("JZ0C1"); // Sybase disconnect error
    }
 
-   protected ConnectionProxy(final HikariPool pool, final PoolBagEntry bagEntry, final LeakTask leakTask) {
+   protected ConnectionProxy(final HikariPool pool, final PoolBagEntry bagEntry, final LeakTask leakTask, final long now) {
       this.parentPool = pool;
       this.bagEntry = bagEntry;
       this.delegate = bagEntry.connection;
       this.leakTask = leakTask;
 
-      this.lastAccess = bagEntry.lastAccess;
+      this.lastAccess = now;
       this.openStatements = new FastList<Statement>(Statement.class, 16);
    }
 

diff --git a/src/main/java/com/zaxxer/hikari/proxy/ProxyFactory.java b/src/main/java/com/zaxxer/hikari/proxy/ProxyFactory.java
@@ -47,7 +47,7 @@ private ProxyFactory()
     * @param leakTask a leak detetection task
     * @return a proxy that wraps the specified {@link Connection}
     */
-   public static IHikariConnectionProxy getProxyConnection(final HikariPool pool, final PoolBagEntry bagEntry, final LeakTask leakTask)
+   public static IHikariConnectionProxy getProxyConnection(final HikariPool pool, final PoolBagEntry bagEntry, final LeakTask leakTask, final long now)
    {
       // Body is injected by JavassistProxyFactory
       return null;