Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8CC207E8B for ; Tue, 20 Sep 2011 22:03:37 +0000 (UTC) Received: (qmail 68053 invoked by uid 500); 20 Sep 2011 22:03:37 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 67970 invoked by uid 500); 20 Sep 2011 22:03:37 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 67962 invoked by uid 99); 20 Sep 2011 22:03:37 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Sep 2011 22:03:37 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Sep 2011 22:03:34 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 7CFA12388A33 for ; Tue, 20 Sep 2011 22:03:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1173400 - in /commons/proper/pool/trunk/src: java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java test/org/apache/commons/pool2/TestPoolUtils.java Date: Tue, 20 Sep 2011 22:03:13 -0000 To: commits@commons.apache.org From: psteitz@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110920220313.7CFA12388A33@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: psteitz Date: Tue Sep 20 22:03:12 2011 New Revision: 1173400 URL: http://svn.apache.org/viewvc?rev=1173400&view=rev Log: Javadoc. Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestPoolUtils.java Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1173400&r1=1173399&r2=1173400&view=diff ============================================================================== --- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java (original) +++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java Tue Sep 20 22:03:12 2011 @@ -1329,6 +1329,16 @@ public class GenericKeyedObjectPool return p; } + /** + * Invalidate toDestroy and if it is idle under key or always is true, destroy it. + * Return true if toDestroy is destroyed. + * + * @param key pool key + * @param toDestroy instance to invalidate and destroy if conditions are met + * @param always true means instance will be destroyed regardless of idle pool membership + * @return true iff toDestroy is destroyed + * @throws Exception + */ private boolean destroy(K key, PooledObject toDestroy, boolean always) throws Exception { Modified: commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java?rev=1173400&r1=1173399&r2=1173400&view=diff ============================================================================== --- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java (original) +++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/LinkedBlockingDeque.java Tue Sep 20 22:03:12 2011 @@ -145,6 +145,10 @@ public class LinkedBlockingDeque /** Condition for waiting puts */ private final Condition notFull = lock.newCondition(); + + public boolean hasTakeWaiters() { + return lock.hasWaiters(notEmpty); + } /** * Creates a {@code LinkedBlockingDeque} with a capacity of Modified: commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestPoolUtils.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestPoolUtils.java?rev=1173400&r1=1173399&r2=1173400&view=diff ============================================================================== --- commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestPoolUtils.java (original) +++ commons/proper/pool/trunk/src/test/org/apache/commons/pool2/TestPoolUtils.java Tue Sep 20 22:03:12 2011 @@ -56,7 +56,7 @@ public class TestPoolUtils { /** Sleep time to let the minIdle tests run CHECK_COUNT times. */ private static final int CHECK_SLEEP_PERIOD = CHECK_PERIOD * (CHECK_COUNT - 1) + CHECK_PERIOD / 2; - @SuppressWarnings("unused") + @Test public void testJavaBeanInstantiation() { new PoolUtils(); }