From b15a7bb3c925eb63651f4ebb6549402cd06e8750 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Fri, 2 Sep 2011 16:31:24 +0000
Subject: [PATCH] git-svn-id: http://code.alibabatech.com/svn/druid/trunk@588
 b9813039-fb51-4c41-a8b9-e21c2acb5095

---
 src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index 5f3610a6e3..2b03570a1a 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -531,6 +531,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
 
         for (;;) {
             while (activeCount >= maxActive) {
+                if (estimate <= 0) {
+                    return null;
+                }
+                
                 try {
                     estimate = notMaxActive.awaitNanos(estimate); // signal by recycle
                 } catch (InterruptedException ie) {