From d097828d9d301db4af329c7b1a88ad3a528a19b1 Mon Sep 17 00:00:00 2001 From: Brett Wooldridge Date: Tue, 18 Nov 2014 21:13:57 +0900 Subject: [PATCH] Fix #198 back out original optimisation as it masks application errors. --- .../src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java | 2 +- .../src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java | 2 +- 2 files changed, 2 insertions(+), 2 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 f801a182..cd519026 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 @@ -51,6 +51,7 @@ public abstract class ConnectionProxy implements IHikariConnectionProxy private final LeakTask leakTask; private FastList openStatements; + private boolean isClosed; private boolean forceClose; private boolean commitStateDirty; private boolean isAnythingDirty; @@ -58,7 +59,6 @@ public abstract class ConnectionProxy implements IHikariConnectionProxy private boolean isCatalogDirty; private boolean isReadOnlyDirty; private boolean isTransactionIsolationDirty; - private volatile boolean isClosed; // static initializer static { 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 f801a182..cd519026 100644 --- a/hikaricp/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java +++ b/hikaricp/src/main/java/com/zaxxer/hikari/proxy/ConnectionProxy.java @@ -51,6 +51,7 @@ public abstract class ConnectionProxy implements IHikariConnectionProxy private final LeakTask leakTask; private FastList openStatements; + private boolean isClosed; private boolean forceClose; private boolean commitStateDirty; private boolean isAnythingDirty; @@ -58,7 +59,6 @@ public abstract class ConnectionProxy implements IHikariConnectionProxy private boolean isCatalogDirty; private boolean isReadOnlyDirty; private boolean isTransactionIsolationDirty; - private volatile boolean isClosed; // static initializer static {