From 35290340011d55c27ab9bd15b8f9197c1e15e770 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Wed, 31 Aug 2011 16:06:46 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=88=9B=E5=BB=BA=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5=E8=B6=85=E8=BF=87maxActive=E7=9A=84bug?=
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@545 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 3eb9e2b30e..ca316b7d2a 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -652,6 +652,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
                     } else if (count >= minIdle) {
                         lowWater.await();
                     }
+                    
+                    if (activeCount >= maxActive) {
+                        break;
+                    }
 
                     Connection connection = connectionFactory.createConnection();
                     ConnectionHolder poolableConnection = new ConnectionHolder(DruidDataSource.this, connection);