Author: kfujino
Date: Tue Jun 28 02:25:28 2016
New Revision: 1750436
URL: http://svn.apache.org/viewvc?rev=1750436&view=rev
Log:
Ensure that do not remove the abandoned connection that has been already
released.
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java?rev=1750436&r1=1750435&r2=1750436&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
(original)
+++
tomcat/tc8.5.x/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/ConnectionPool.java
Tue Jun 28 02:25:28 2016
@@ -951,9 +951,9 @@ public class ConnectionPool {
boolean setToNull = false;
try {
con.lock();
- //the con has been returned to the pool
+ //the con has been returned to the pool or released
//ignore it
- if (idle.contains(con))
+ if (idle.contains(con) || con.isReleased())
continue;
long time = con.getTimestamp();
long now = System.currentTimeMillis();
Modified: tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml?rev=1750436&r1=1750435&r2=1750436&view=diff
==============================================================================
--- tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc8.5.x/trunk/webapps/docs/changelog.xml Tue Jun 28 02:25:28 2016
@@ -162,6 +162,10 @@
Fix the duplicated connection release when connection verification
failed. (kfujino)
</fix>
+ <fix>
+ Ensure that do not remove the abandoned connection that has been
already
+ released. (kfujino)
+ </fix>
</changelog>
</subsection>
<subsection name="Other">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
