From c87c002cebb83dfc986843f0d55837e6561ddb93 Mon Sep 17 00:00:00 2001
From: Brett Wooldridge <brett.wooldridge@gmail.com>
Date: Sat, 11 Jul 2015 09:48:15 +0900
Subject: [PATCH] Performance tweak

---
 .../java/com/zaxxer/hikari/pool/PoolBagEntry.java    |  2 +-
 .../com/zaxxer/hikari/proxy/ConnectionProxy.java     | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zaxxer/hikari/pool/PoolBagEntry.java b/src/main/java/com/zaxxer/hikari/pool/PoolBagEntry.java
index 1d410390..9b0188c0 100644
--- a/src/main/java/com/zaxxer/hikari/pool/PoolBagEntry.java
+++ b/src/main/java/com/zaxxer/hikari/pool/PoolBagEntry.java
@@ -44,10 +44,10 @@ public final class PoolBagEntry implements IConcurrentBagEntry
    public volatile boolean evicted;
    public volatile boolean aborted;
 
+   public boolean isAutoCommit;
    int networkTimeout;
    int transactionIsolation;
    String catalog;
-   boolean isAutoCommit;
    boolean isReadOnly;
    
    private final PoolElf poolElf;
diff --git a/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java b/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java
index 51b820a3..28ba3b69 100644
--- a/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java
+++ b/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java
@@ -146,13 +146,6 @@ public abstract class ConnectionProxy implements IHikariConnectionProxy
       return statement;
    }
 
-   private final void resetConnectionState() throws SQLException
-   {
-      poolEntry.resetConnectionState();
-
-      lastAccess = clockSource.currentTime();
-   }
-
    // **********************************************************************
    //                   "Overridden" java.sql.Connection Methods
    // **********************************************************************
@@ -180,13 +173,14 @@ public abstract class ConnectionProxy implements IHikariConnectionProxy
             if (isCommitStateDirty) {
                lastAccess = clockSource.currentTime();
 
-               if (!delegate.getAutoCommit()) {
+               if (!poolEntry.isAutoCommit) {
                   delegate.rollback();
                }
             }
 
             if (isConnectionStateDirty) {
-               resetConnectionState();
+               poolEntry.resetConnectionState();
+               lastAccess = clockSource.currentTime();
             }
 
             delegate.clearWarnings();