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

支持numTestsPerEvictionRun

Browse Source 
git-svn-id: http://code.alibabatech.com/svn/druid/trunk@382 b9813039-fb51-4c41-a8b9-e21c2acb5095
This commit is contained in:
wenshao
2011-07-12 10:07:52 +00:00
parent 9e720ca75c
commit 9c555b01ef
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+12 -9
View File
@@ -629,7 +629,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
public void run() {
initedLatch.countDown();
final List<Connection> evictList = new ArrayList<Connection>();
final List<ConnectionHolder> evictList = new ArrayList<ConnectionHolder>();
FOR_0: for (;;) {
// 从前面开始删除
try {
@@ -646,8 +646,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
continue;
}
int removeCount = 0;
ConnectionHolder first = null;
int evictCount = 0;
lock.lock();
try {
int numTestsPerEvictionRun = DruidDataSource.this.numTestsPerEvictionRun;
@@ -656,7 +655,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
for (int i = 0; i < numTestsPerEvictionRun; ++i) {
first = connections[0];
ConnectionHolder first = connections[0];
if (first == null) {
continue FOR_0;
@@ -673,17 +672,21 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
// removete first
System.arraycopy(connections, 1, connections, 0, count - 1);
connections[--count] = null;
evictList.add(first);
evictCount++;
}
}
} finally {
lock.unlock();
}
Connection connection = first.getConnection();
try {
connection.close();
} catch (SQLException e) {
LOG.error("create connection error", e);
for (ConnectionHolder item : evictList) {
Connection connection = item.getConnection();
try {
connection.close();
} catch (SQLException e) {
LOG.error("create connection error", e);
}
}
destroyCount++;