svn commit: r1608249 - /tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java

[andygumbrecht]

Author: andygumbrecht
Date: Sun Jul  6 17:08:00 2014
New Revision: 1608249

URL: http://svn.apache.org/r1608249
Log:
drainPermits, but not too early

Modified:
    
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java

Modified: 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
URL: 
http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java?rev=1608249&r1=1608248&r2=1608249&view=diff
==============================================================================
--- 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
 (original)
+++ 
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
 Sun Jul  6 17:08:00 2014
@@ -425,14 +425,10 @@ public class Pool<T> {
             Thread.yield();
         }
 
-        instances.drainPermits();
-
         while (minimum.tryAcquire()) {
             Thread.yield();
         }
 
-        minimum.drainPermits();
-
         // flush and sweep
         flush();
         try {
@@ -453,6 +449,9 @@ public class Pool<T> {
             available.drainPermits();
         }
 
+        instances.drainPermits();
+        minimum.drainPermits();
+
         // Wait for any pending discards
         return out.await(timeout, unit);
     }