Author: psteitz Date: Thu Jun 21 23:12:17 2007 New Revision: 549729 URL: http://svn.apache.org/viewvc?view=rev&rev=549729 Log: Allowed blocked threads in GenericObjectPool borrowObject to be interrupted. JIRA: POOL-102 Reported and patched: John Sumsion
Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java jakarta/commons/proper/pool/trunk/xdocs/changes.xml Modified: jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java URL: http://svn.apache.org/viewvc/jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java?view=diff&rev=549729&r1=549728&r2=549729 ============================================================================== --- jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java (original) +++ jakarta/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java Thu Jun 21 23:12:17 2007 @@ -851,7 +851,8 @@ } } } catch(InterruptedException e) { - // ignored + Thread.currentThread().interrupt(); + throw e; } if(_maxWait > 0 && ((System.currentTimeMillis() - starttime) >= _maxWait)) { throw new NoSuchElementException("Timeout waiting for idle object"); Modified: jakarta/commons/proper/pool/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jakarta/commons/proper/pool/trunk/xdocs/changes.xml?view=diff&rev=549729&r1=549728&r2=549729 ============================================================================== --- jakarta/commons/proper/pool/trunk/xdocs/changes.xml (original) +++ jakarta/commons/proper/pool/trunk/xdocs/changes.xml Thu Jun 21 23:12:17 2007 @@ -30,7 +30,7 @@ Edited all KeyedObjectPool related JavaDocs to have meaningful and correct content. </action> <action dev="sandymac" type="fix"> - Implemented until tests to verify KeyedObjectPool implementations conformed to Pool 2 contracts. + Implemented unit tests to verify KeyedObjectPool implementations conformed to Pool 2 contracts. Updated GenericKeyedObjectPool and StackKeyedObjectPool to conformant behavior. </action> <action dev="sandymac" type="fix"> @@ -65,6 +65,9 @@ <fixes issue="38669"/> <fixes issue="38746"/> <dueto name="Sandy McArthur"/> + </action> + <action dev="psteitz" type="fix" issue="POOL-102" due-to="John Sumsion"> + Allowed blocked threads in GenericObjectPool borrowObject to be interrupted. </action> </release> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]