From ace97a4dde46b07db30316e9feb7c7337e1ac2de Mon Sep 17 00:00:00 2001 From: kkolinko Date: Fri, 26 Aug 2011 13:07:16 +0000 Subject: [PATCH] Followup for r1157874 which is a Fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=51583 Break loop immediately, because con is never set to null and you'll try releasing it twice. git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1162102 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java index 090dff620..b2a7644bd 100644 --- a/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java +++ b/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java @@ -366,6 +366,8 @@ public class ConnectionPool { abandon(con); if (pool.size()>0) { con = pool.poll(1000, TimeUnit.MILLISECONDS); + } else { + break; } } //while } catch (InterruptedException ex) { -- 2.11.0