From b2f61a9459807faf529edc163c76daab97853b46 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Wed, 13 Jul 2011 08:17:08 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9minIdle=E7=AD=96=E7=95=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@420 b9813039-fb51-4c41-a8b9-e21c2acb5095
---
 .../alibaba/druid/pool/DruidDataSource.java   | 24 +++++++++----------
 .../alibaba/druid/pool/benckmark/Case3.java   | 20 ++++++++--------
 .../pool/ui/DruidDataSourceUIManager.java     |  4 ++--
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index cf7bc12be0..8f6b268c89 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -502,12 +502,12 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         connections[lastIndex] = null;
         count--;
 
-//        if (count <= minIdle - 1) {
-//            lowWater.signal();
-//        }
-//        if (count == 0) {
-//            lowWater.signal();
-//        }
+        if (count <= minIdle - 1) {
+            lowWater.signal();
+        }
+        if (count == 0) {
+            lowWater.signal();
+        }
 
         return last;
     }
@@ -547,12 +547,12 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             connections[lastIndex] = null;
             count--;
 
-//            if (lastIndex == minIdle - 1) {
-//                lowWater.signal();
-//            }
-//            if (count == 0) {
-//                lowWater.signal();
-//            }
+            if (lastIndex == minIdle - 1) {
+                lowWater.signal();
+            }
+            if (count == 0) {
+                lowWater.signal();
+            }
 
             return last;
         }
diff --git a/src/test/java/com/alibaba/druid/pool/benckmark/Case3.java b/src/test/java/com/alibaba/druid/pool/benckmark/Case3.java
index 3ec2224e25..211f590ebc 100644
--- a/src/test/java/com/alibaba/druid/pool/benckmark/Case3.java
+++ b/src/test/java/com/alibaba/druid/pool/benckmark/Case3.java
@@ -41,22 +41,22 @@ public class Case3 extends TestCase {
     private long    minEvictableIdleTimeMillis    = 60000;
 
     protected void setUp() throws Exception {
-//        jdbcUrl = "jdbc:fake:dragoon_v25masterdb";
-//        user = "dragoon25";
-//        password = "dragoon25";
-//        driverClass = "com.alibaba.druid.mock.MockDriver";
-//        connectionProperties = "connectSleep=3;executeSleep=0";
+        jdbcUrl = "jdbc:fake:dragoon_v25masterdb";
+        user = "dragoon25";
+        password = "dragoon25";
+        driverClass = "com.alibaba.druid.mock.MockDriver";
+        connectionProperties = "connectSleep=3;executeSleep=1";
 
-        jdbcUrl = "jdbc:mysql://10.20.153.104:3306/druid2";
-        user = "root";
-        password = "root";
-        driverClass = "com.mysql.jdbc.Driver";
+//        jdbcUrl = "jdbc:mysql://10.20.153.104:3306/druid2";
+//        user = "root";
+//        password = "root";
+//        driverClass = "com.mysql.jdbc.Driver";
     }
 
     public void test_perf() throws Exception {
         for (int i = 0; i < 10; ++i) {
             druid();
-            dbcp();
+//            dbcp();
             // boneCP();
         }
     }
diff --git a/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java b/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java
index fd8fd83786..b0daf81a17 100644
--- a/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java
+++ b/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java
@@ -541,10 +541,10 @@ public class DruidDataSourceUIManager extends JFrame {
 
             public void run() {
                 final int threadCount = 10;
-                final int LOOP_COUNT = 1000 * 100;
+                final int LOOP_COUNT = 1000 * 10;
                 final String sql = "SELECT 1";
                 final CountDownLatch startLatch = new CountDownLatch(1);
-                final CountDownLatch endLatch = new CountDownLatch(1);
+                final CountDownLatch endLatch = new CountDownLatch(threadCount);
                 for (int i = 0; i < threadCount; ++i) {
                     Thread thread = new Thread() {