Additional fix for r1170479.

Make sure calling disconnect() when only setDiscarded(true) is called and the real connection is not closed.

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

diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
index 4ab72fd..d8f3503 100644 (file)
--- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
+++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java
@@ -309,7 +309,7 @@ public class PooledConnection {
      * @param finalize if set to true, a call to {@link ConnectionPool#finalize(PooledConnection)} is called.
      */
     private void disconnect(boolean finalize) {
-        if (isDiscarded()) {
+        if (isDiscarded() && connection == null) {
             return;
         }
         setDiscarded(true);