Author: dblevins
Date: Fri May 28 17:28:38 2010
New Revision: 949233

URL: http://svn.apache.org/viewvc?rev=949233&view=rev
Log:
Wait forever if timeout is -1

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java?rev=949233&r1=949232&r2=949233&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
 Fri May 28 17:28:38 2010
@@ -168,7 +168,9 @@ public class Pool<T> {
      * @throws TimeoutException      if no instance could be obtained within 
the timeout
      */
     private Entry<T> pop(long timeout, TimeUnit unit, boolean record) throws 
InterruptedException, TimeoutException {
-        if (!available.tryAcquire(timeout, unit)) {
+        if (timeout == -1) {
+             available.tryAcquire();
+        } else if (!available.tryAcquire(timeout, unit)) {
             if (record) stats.accessTimeouts.record();
             throw new TimeoutException("Waited " + timeout + " " + unit);
         }


Reply via email to