From 5839d24548b42f39e3a1eba4dc24b1b9b3b4b060 Mon Sep 17 00:00:00 2001
From: kfujino <kfujino@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 14 Sep 2011 09:05:40 +0000
Subject: [PATCH] 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
---
 .../src/main/java/org/apache/tomcat/jdbc/pool/PooledConnection.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 4ab72fd69..d8f350300 100644
--- 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);
-- 
2.11.0