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@381 b9813039-fb51-4c41-a8b9-e21c2acb5095

Browse Source
This commit is contained in:
wenshao
2011-07-12 10:04:52 +00:00
parent 25fd0b98af
commit 9e720ca75c
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+7 -4
View File
@@ -45,7 +45,6 @@ import com.alibaba.druid.filter.stat.StatFilter;
import com.alibaba.druid.logging.Log;
import com.alibaba.druid.logging.LogFactory;
import com.alibaba.druid.pool.vendor.MSSQLValidConnectionChecker;
import com.alibaba.druid.pool.vendor.MySqlValidConnectionChecker;
import com.alibaba.druid.pool.vendor.OracleValidConnectionChecker;
import com.alibaba.druid.proxy.DruidDriver;
import com.alibaba.druid.proxy.jdbc.DataSourceProxyConfig;
@@ -630,6 +629,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
public void run() {
initedLatch.countDown();
final List<Connection> evictList = new ArrayList<Connection>();
FOR_0: for (;;) {
// 从前面开始删除
try {
@@ -646,6 +646,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
continue;
}
int removeCount = 0;
ConnectionHolder first = null;
lock.lock();
try {
@@ -668,9 +669,11 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
continue FOR_0;
}
// removete first
System.arraycopy(connections, 1, connections, 0, count - 1);
connections[--count] = null;
if (count > minIdle) {
// removete first
System.arraycopy(connections, 1, connections, 0, count - 1);
connections[--count] = null;
}
}
} finally {
lock.unlock();