From 8c0adbe424eca2b7678677e2d788511fbc281ee6 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Fri, 2 Sep 2011 13:35:51 +0000
Subject: [PATCH] bug fixed

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@567 b9813039-fb51-4c41-a8b9-e21c2acb5095
---
 src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index 54f20241bb..cc9e17d83e 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -654,7 +654,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                     }
 
                     // 防止创建超过maxActive数量的连接
-                    if (activeCount + poolingCount >= maxIdle) {
+                    int max = maxActive > maxIdle ? maxActive : maxIdle;
+                    if (activeCount + poolingCount >= max) {
                         lowWater.await();
                         continue;
                     }