Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

修正connection.close的并发问题

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@326 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-06-30 08:57:37 +00:00
parent bb581829d4
commit fce80a01ad
5 changed files with 152 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+8 -1
View File
@@ -271,6 +271,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
*/
protected void recycle(PoolableConnection pooledConnection) throws SQLException {
final Connection conn = pooledConnection.getConnection();
ConnectionHolder holder = pooledConnection.getConnectionHolder();
assert holder != null;
try {
if (activeConnectionTraceEnable) {
activeConnections.remove(pooledConnection);
@@ -280,6 +284,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (conn == null || conn.isClosed()) {
lock.lock();
try {
holder.reset();
decrementActiveCount();
closeCount++;
} finally {
@@ -306,6 +311,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (count >= maxIdle) {
lock.lock();
try {
holder.reset();
conn.close();
decrementActiveCount();
} finally {
@@ -328,7 +334,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
closeCount++;
// 第六步，加入队列中(putLast)
putLast(pooledConnection.getConnectionHolder());
holder.reset();
putLast(holder);
recycleCount++;
} finally {
lock.unlock();