Author: fhanik
Date: Mon Aug 15 15:06:35 2011
New Revision: 1157874
URL: http://svn.apache.org/viewvc?rev=1157874&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51583
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=1157874&r1=1157873&r2=1157874&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
Mon Aug 15 15:06:35 2011
@@ -364,7 +364,9 @@ public class ConnectionPool {
release(con);
else
abandon(con);
- con = pool.poll(1000, TimeUnit.MILLISECONDS);
+ if (pool.size()>0) {
+ con = pool.poll(1000, TimeUnit.MILLISECONDS);
+ }
} //while
} catch (InterruptedException ex) {
Thread.interrupted();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
