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

修正失效连接占用activeCount的问题

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@542 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-08-30 07:36:59 +00:00
parent aa4965e0f7
commit 9d2521fb5b
2 changed files with 31 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+3
View File
@@ -266,6 +266,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
Connection realConnection = poolalbeConnection.getConnection();
JdbcUtils.close(realConnection);
this.decrementActiveCountWithLock();
continue;
}
poolalbeConnection.getConnectionHolder().setLastCheckTimeMillis(System.currentTimeMillis());
@@ -273,6 +274,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
Connection realConnection = poolalbeConnection.getConnection();
if (realConnection.isClosed()) {
JdbcUtils.close(realConnection);
this.decrementActiveCountWithLock();
continue;
}
@@ -286,6 +288,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
JdbcUtils.close(realConnection);
this.decrementActiveCountWithLock();
continue;
}
poolalbeConnection.getConnectionHolder().setLastCheckTimeMillis(System.currentTimeMillis());
src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java
+28
View File
@@ -31,9 +31,11 @@ public class TestIdle extends TestCase {
Connection conn = dataSource.getConnection();
Assert.assertEquals(dataSource.getInitialSize(), driver.getConnections().size());
Assert.assertEquals(1, dataSource.getActiveCount());
conn.close();
Assert.assertEquals(dataSource.getInitialSize(), driver.getConnections().size());
Assert.assertEquals(0, dataSource.getActiveCount());
}
{
@@ -41,11 +43,14 @@ public class TestIdle extends TestCase {
Connection[] connections = new Connection[4];
for (int i = 0; i < count; ++i) {
connections[i] = dataSource.getConnection();
Assert.assertEquals(i + 1, dataSource.getActiveCount());
}
Assert.assertEquals(4, driver.getConnections().size());
for (int i = 0; i < count; ++i) {
connections[i].close();
Assert.assertEquals(count - i - 1, dataSource.getActiveCount());
}
Assert.assertEquals(0, dataSource.getActiveCount());
Assert.assertEquals(4, driver.getConnections().size());
Thread.sleep(dataSource.getMinEvictableIdleTimeMillis() * 2);
@@ -62,10 +67,33 @@ public class TestIdle extends TestCase {
Assert.assertEquals(1, dataSource.getPoolingCount());
{
Connection conn = dataSource.getConnection();
Assert.assertEquals(1, dataSource.getActiveCount());
Assert.assertEquals(dataSource.getMinIdle(), driver.getConnections().size());
conn.close();
Assert.assertEquals(dataSource.getMinIdle(), driver.getConnections().size());
Assert.assertEquals(0, dataSource.getActiveCount());
}
{
int count = 4;
Connection[] connections = new Connection[4];
for (int i = 0; i < count; ++i) {
connections[i] = dataSource.getConnection();
Assert.assertEquals(i + 1, dataSource.getActiveCount());
}
Assert.assertEquals(4, driver.getConnections().size());
for (int i = 0; i < count; ++i) {
connections[i].close();
Assert.assertEquals(count - i - 1, dataSource.getActiveCount());
}
Assert.assertEquals(4, driver.getConnections().size());
Assert.assertEquals(0, dataSource.getActiveCount());
dataSource.shrink();
Assert.assertEquals(0, dataSource.getActiveCount());
Assert.assertEquals(dataSource.getMinIdle(), driver.getConnections().size());
}
dataSource.close();
}