Don't skip rollback just because nothing is dirty.

11 years ago · 98cbc3b36d
parent f3e474d209
commit 98cbc3b36d
2 changed files with 8 additions and 8 deletions
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java
@ -147,10 +147,6 @@ public abstract class ConnectionProxy implements IHikariConnectionProxy

   private final void resetConnectionState() throws SQLException
   {
-      if (!delegate.getAutoCommit()) {
-         delegate.rollback();
-      }
-
      if (isReadOnlyDirty) {
         delegate.setReadOnly(parentPool.isReadOnly);
      }
@ -194,6 +190,10 @@ public abstract class ConnectionProxy implements IHikariConnectionProxy
         }

         try {
+            if (!delegate.getAutoCommit()) {
+               delegate.rollback();
+            }
+
            if (isAnythingDirty) {
               resetConnectionState();
            }
--- a/hikaricp/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java
@ -147,10 +147,6 @@ public abstract class ConnectionProxy implements IHikariConnectionProxy

   private final void resetConnectionState() throws SQLException
   {
-      if (!delegate.getAutoCommit()) {
-         delegate.rollback();
-      }
-
      if (isReadOnlyDirty) {
         delegate.setReadOnly(parentPool.isReadOnly);
      }
@ -194,6 +190,10 @@ public abstract class ConnectionProxy implements IHikariConnectionProxy
         }

         try {
+            if (!delegate.getAutoCommit()) {
+               delegate.rollback();
+            }
+
            if (isAnythingDirty) {
               resetConnectionState();
            }