From 221156e25c6a8368fa7cd26c7b46660a3c71dda4 Mon Sep 17 00:00:00 2001 From: wenshao Date: Wed, 31 Aug 2011 16:32:32 +0000 Subject: [PATCH] bug fixed git-svn-id: http://code.alibabatech.com/svn/druid/trunk@548 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 2 +- 1 file changed, 1 insertion(+), 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 ca316b7d2a..a68ca21370 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -548,7 +548,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat long nanos = unit.toNanos(timeout); for (;;) { - if (activeCount == maxActive) { + if (activeCount >= maxActive) { long startNano = System.nanoTime(); notMaxActive.awaitNanos(nanos); nanos -= (System.nanoTime() - startNano);