reset state when the connection is closed

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1058286 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
index a56d969..6da8bd5 100644 (file)
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/interceptor/ConnectionState.java
@@ -54,7 +54,14 @@ public class ConnectionState extends JdbcInterceptor  {
     
     @Override
     public void reset(ConnectionPool parent, PooledConnection con) {
-        if (parent==null || con==null) return;
+        if (parent==null || con==null) {
+            //we are resetting, reset our defaults
+            autoCommit = null;
+            transactionIsolation = null;
+            readOnly = null;
+            catalog = null;
+            return;
+        }
         PoolConfiguration poolProperties = parent.getPoolProperties();
         if (poolProperties.getDefaultTransactionIsolation()!=DataSourceFactory.UNKNOWN_TRANSACTIONISOLATION) {
             try {