From 571f595bbfb034ea75bfe4cd1f8a2a52f192dac0 Mon Sep 17 00:00:00 2001 From: wenshao Date: Fri, 2 Sep 2011 16:01:18 +0000 Subject: [PATCH] git-svn-id: http://code.alibabatech.com/svn/druid/trunk@580 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../com/alibaba/druid/pool/DruidDataSource.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index d7eb373681..c1401ceb71 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -501,13 +501,13 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat ConnectionHolder takeLast() throws InterruptedException { while (activeCount >= maxActive) { - notMaxActive.await(); + notMaxActive.await(); // signal by recycle } try { while (poolingCount == 0) { lowWater.signal(); // send signal to CreateThread create connection - notEmpty.await(); + notEmpty.await(); // signal by recycle or creator } } catch (InterruptedException ie) { notEmpty.signal(); // propagate to non-interrupted thread @@ -518,13 +518,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat ConnectionHolder last = connections[poolingCount]; connections[poolingCount] = null; -// if ((minIdle == 0 && poolingCount == 0) || poolingCount <= minIdle - 1) { -// lowWater.signal(); -// } - // if (count == 0) { - // lowWater.signal(); - // } - return last; } @@ -537,7 +530,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat } if (poolingCount == 0) { - lowWater.signal(); + lowWater.signal(); // send signal to CreateThread create connection estimate = notEmpty.awaitNanos(estimate); // signal by recycle or creator