From 98cbc3b36d58f4a7002f41c80fec8290a6eaff1f Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Sat, 11 Oct 2014 15:52:42 +0900 Subject: [PATCH] Don't skip rollback just because nothing is dirty. --- .../java/com/zaxxer/hikari/proxy/ConnectionProxy.java | 8 ++++---- .../java/com/zaxxer/hikari/proxy/ConnectionProxy.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java index 0e32b3bd..cd16c6c4 100644 --- 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(); } diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java b/hikaricp/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java index 0e32b3bd..cd16c6c4 100644 --- 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(); }