Author: kfujino Date: Wed Sep 14 08:53:58 2011 New Revision: 1170479 URL: http://svn.apache.org/viewvc?rev=1170479&view=rev Log: Fix BZ51786. Discarded connection is not active in a pool any longer. It removes from the active connection list.
Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java?rev=1170479&r1=1170478&r2=1170479&view=diff ============================================================================== --- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java (original) +++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ProxyConnection.java Wed Sep 14 08:53:58 2011 @@ -94,7 +94,7 @@ public class ProxyConnection extends Jdb 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); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org