You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2015/06/23 19:14:40 UTC
svn commit: r1687097 -
/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java
Author: kwright
Date: Tue Jun 23 17:14:39 2015
New Revision: 1687097
URL: http://svn.apache.org/r1687097
Log:
Second fix for CONNECTORS-1202.
Modified:
manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java
Modified: manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java?rev=1687097&r1=1687096&r2=1687097&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java (original)
+++ manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/jdbcpool/ConnectionPool.java Tue Jun 23 17:14:39 2015
@@ -163,8 +163,17 @@ public class ConnectionPool
// it into the pool.
if (rval != null)
{
+ // We have a handle, so just free it and leave activeConnections alone
release(rval);
}
+ else
+ {
+ // We didn't manage to create the handle, so decrement active connections.
+ synchronized (this)
+ {
+ activeConnections--;
+ }
+ }
}
}
}