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

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@518 b9813039-fb51-4c41-a8b9-e21c2acb5095

Browse Source
This commit is contained in:
wenshao
2011-07-26 02:09:38 +00:00
parent ab3e5085c3
commit 4c2d6ff497
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
D:\data.txt
View File
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+12 -4
View File
@@ -699,8 +699,16 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (numTestsPerEvictionRun <= 0) {
numTestsPerEvictionRun = 1;
}
for (int i = 0; i < numTestsPerEvictionRun && i < count; ++i) {
final int testCount;
if (numTestsPerEvictionRun <= count) {
testCount = numTestsPerEvictionRun;
} else {
testCount = count;
}
for (int i = 0; i < testCount; ++i) {
ConnectionHolder connection = connections[i];
if (evictCount == 0 && idleCount == 0 && connection == null) {
@@ -708,14 +716,14 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
long idleMillis = System.currentTimeMillis() - connection.getLastActiveMillis();
if (idleMillis >= minEvictableIdleTimeMillis) {
if (idleMillis >= minEvictableIdleTimeMillis && count - evictList.size() > minIdle) {
evictList.add(connection);
} else {
idleList.add(connection);
}
}
System.arraycopy(connections, numTestsPerEvictionRun, connections, 0, count - numTestsPerEvictionRun);
for (int i = 0; i < numTestsPerEvictionRun; ++i) {
System.arraycopy(connections, testCount, connections, 0, count - testCount);
for (int i = 0; i < testCount; ++i) {
connections[--count] = null;
}
} finally {
src/test/java/com/alibaba/druid/bvt/pool/TestIdle.java
+1 -1
View File
@@ -59,7 +59,7 @@ public class TestIdle extends TestCase {
Thread.sleep(dataSource.getMinEvictableIdleTimeMillis() * 2);
Assert.assertEquals(0, driver.getConnections().size());
Assert.assertEquals(1, dataSource.getPoolingCount());
Assert.assertEquals(0, dataSource.getPoolingCount());
{
Connection conn = dataSource.getConnection();
Assert.assertEquals(dataSource.getMinIdle(), driver.getConnections().size());