Author: andygumbrecht
Date: Sun Jul 6 17:01:52 2014
New Revision: 1608248
URL: http://svn.apache.org/r1608248
Log:
drainPermits
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=1608248&r1=1608247&r2=1608248&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:01:52 2014
@@ -324,7 +324,7 @@ public class Pool<T> {
try {
if (entry == null) {
- return added;
+ return false;
}
if (!sweeper) {
@@ -424,10 +424,15 @@ public class Pool<T> {
while (instances.tryAcquire()) {
Thread.yield();
}
+
+ instances.drainPermits();
+
while (minimum.tryAcquire()) {
Thread.yield();
}
+ minimum.drainPermits();
+
// flush and sweep
flush();
try {
@@ -444,6 +449,8 @@ public class Pool<T> {
while (available.tryAcquire()) {
Thread.yield();
}
+
+ available.drainPermits();
}
// Wait for any pending discards
