git-svn-id: http://code.alibabatech.com/svn/druid/trunk@578 b9813039-fb51-4c41-a8b9-e21c2acb5095

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;
                 }
             }