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

src/main/java/com/alibaba/druid/pool/DruidDataSource.java

@@ -365,18 +365,18 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             }
 
             // 第四步，检查是符合MaxIdle的设定
-//            if (count >= maxIdle) {
-//                lock.lock();
-//                try {
-//                    JdbcUtils.close(conn);
-//                    destroyCount++;
-//                    closeCount++;
-//                    decrementActiveCount();
-//                } finally {
-//                    lock.unlock();
-//                }
-//                return;
-//            }
+            if (count >= maxIdle) {
+                lock.lock();
+                try {
+                    JdbcUtils.close(conn);
+                    destroyCount++;
+                    closeCount++;
+                    decrementActiveCount();
+                } finally {
+                    lock.unlock();
+                }
+                return;
+            }
 
             //
             if (isTestOnReturn()) {
@@ -502,7 +502,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         connections[lastIndex] = null;
         count--;
 
-        if (lastIndex <= minIdle - 1) {
+//        if (count <= minIdle - 1) {
+//            lowWater.signal();
+//        }
+        if (count == 0) {
             lowWater.signal();
         }