Author: kkolinko Date: Fri Aug 26 13:07:16 2011 New Revision: 1162102 URL: http://svn.apache.org/viewvc?rev=1162102&view=rev Log: 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.
Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1162102&r1=1162101&r2=1162102&view=diff ============================================================================== --- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java (original) +++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java Fri Aug 26 13:07:16 2011 @@ -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) { --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org