From c33c67e5dd95ffc251979c68e076656cc6a820bf Mon Sep 17 00:00:00 2001 From: wenshao Date: Fri, 2 Sep 2011 17:44:38 +0000 Subject: [PATCH] git-svn-id: http://code.alibabatech.com/svn/druid/trunk@595 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 694c40f131..837bdeef96 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -689,7 +689,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat initedLatch.countDown(); final List evictList = new ArrayList(); - FOR_0: for (;;) { + for (;;) { // 从前面开始删除 try { if (timeBetweenEvictionRunsMillis > 0) { @@ -717,10 +717,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat for (int i = 0; i < poolingCount; ++i) { ConnectionHolder connection = connections[i]; - if (connection == null) { - continue FOR_0; - } - if (poolingCount - evictList.size() <= minIdle) { break; }