From 09a76e890ab8f1677eb3543ed47d17e966ad1a0b Mon Sep 17 00:00:00 2001 From: kfujino Date: Wed, 14 Sep 2011 08:53:58 +0000 Subject: [PATCH] Fix BZ51786. Discarded connection is not active in a pool any longer. It removes from the active connection list. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1170479 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java index 76d17e341..1c36d7c9c 100644 --- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java +++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java @@ -94,7 +94,7 @@ public class ProxyConnection extends JdbcInterceptor { return Boolean.valueOf(isClosed()); } if (compare(CLOSE_VAL,method)) { - if (isClosed()) return null; //noop for already closed. + if (connection==null) return null; //noop for already closed. PooledConnection poolc = this.connection; this.connection = null; pool.returnConnection(poolc); -- 2.11.0