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

2023-03-04 19:17:16 +00:00 · 2011-05-30 06:25:31 +00:00
parent 938b7a93f4
commit ff6c1d3974
2 changed files with 128 additions and 3 deletions
@@ -431,10 +431,20 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
            if (count == 0) {
                lowWater.signal();

-                notEmpty.awaitNanos(nanos);
+                long estimate = nanos;
+                for (;;) {
+                    estimate = notEmpty.awaitNanos(estimate);

-                if (count == 0) {
-                    return null;
+                    if (count == 0) {
+                        if (estimate > 0) {
+                            nanos = estimate;
+                            continue;
+                        }
+                        
+                        return null;
+                    }
+                    
+                    break;
                }
            }