From d0f04f411b1558799c314f3912dc8144de94b4ad Mon Sep 17 00:00:00 2001 From: wenshao Date: Fri, 2 Sep 2011 15:48:42 +0000 Subject: [PATCH] git-svn-id: http://code.alibabatech.com/svn/druid/trunk@578 b9813039-fb51-4c41-a8b9-e21c2acb5095 --- .../com/alibaba/druid/pool/DruidDataSource.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index d28f2e7598..ed8eb15a80 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -531,7 +531,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat ConnectionHolder pollLast(long timeout, TimeUnit unit) throws InterruptedException { long estimate = unit.toNanos(timeout); - FOR_0: for (;;) { if (activeCount >= maxActive) { estimate = notMaxActive.awaitNanos(estimate); @@ -539,19 +538,15 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat if (poolingCount == 0) { lowWater.signal(); + + estimate = notEmpty.awaitNanos(estimate); - for (;;) { - estimate = notEmpty.awaitNanos(estimate); - - if (poolingCount == 0) { - if (estimate > 0) { - continue FOR_0; - } - - return null; + if (poolingCount == 0) { + if (estimate > 0) { + continue; } - break; + return null; } }