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 3713710A65 for ; Mon, 10 Feb 2014 11:32:45 +0000 (UTC) Received: (qmail 63048 invoked by uid 500); 10 Feb 2014 11:32:43 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 62732 invoked by uid 500); 10 Feb 2014 11:32:41 -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 62721 invoked by uid 99); 10 Feb 2014 11:32:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 10 Feb 2014 11:32:40 +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; Mon, 10 Feb 2014 11:32:37 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B06002388994; Mon, 10 Feb 2014 11:32:17 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: svn commit: r1566584 - in /commons/proper/pool/trunk/src: changes/ main/java/org/apache/commons/pool2/ main/java/org/apache/commons/pool2/impl/ test/java/org/apache/commons/pool2/ test/java/org/apache/commons/pool2/impl/ Date: Mon, 10 Feb 2014 11:32:16 -0000 To: commits@commons.apache.org From: markt@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140210113217.B06002388994@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: markt Date: Mon Feb 10 11:32:16 2014 New Revision: 1566584 URL: http://svn.apache.org/r1566584 Log: Fix POOL-249 (Java 8 javadoc fixes) with a patch by Ville Skyttä Also fix all the remaining Javadoc warnings Modified: commons/proper/pool/trunk/src/changes/changes.xml commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseKeyedPooledObjectFactory.java commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BaseObjectPool.java commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/BasePooledObjectFactory.java commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/KeyedObjectPool.java commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/KeyedPooledObjectFactory.java commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/ObjectPool.java commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PoolUtils.java commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PooledObjectFactory.java commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestObjectPool.java commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java Modified: commons/proper/pool/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/changes/changes.xml?rev=1566584&r1=1566583&r2=1566584&view=diff ============================================================================== --- commons/proper/pool/trunk/src/changes/changes.xml (original) +++ commons/proper/pool/trunk/src/changes/changes.xml Mon Feb 10 11:32:16 2014 @@ -49,6 +49,12 @@ The type attribute can be add,u Ensure that if an attempt is made to return an object multiple times that the current active and idle object counts are not corrupted. + + Fix Javadoc issues when building docs with Java 8. + + + Fix the remaining Javadoc warnings. + implements Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PooledObjectFactory.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PooledObjectFactory.java?rev=1566584&r1=1566583&r2=1566584&view=diff ============================================================================== --- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PooledObjectFactory.java (original) +++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/PooledObjectFactory.java Mon Feb 10 11:32:16 2014 @@ -58,7 +58,7 @@ package org.apache.commons.pool2; *

* While clients of a {@link KeyedObjectPool} borrow and return instances of * the underlying value type {@code V}, the factory methods act on instances of - * {@link PooledObject PooledObject}. These are the object wrappers that + * {@link PooledObject PooledObject<V>}. These are the object wrappers that * pools use to track and maintain state information about the objects that * they manage. * Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java?rev=1566584&r1=1566583&r2=1566584&view=diff ============================================================================== --- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java (original) +++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/AbandonedConfig.java Mon Feb 10 11:32:16 2014 @@ -44,7 +44,7 @@ public class AbandonedConfig { * *

If set to true, abandoned objects are removed by borrowObject if * there are fewer than 2 idle objects available in the pool and - * getNumActive() > getMaxTotal() - 3

+ * getNumActive() > getMaxTotal() - 3

* * @return true if abandoned objects are to be removed by borrowObject */ Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java?rev=1566584&r1=1566583&r2=1566584&view=diff ============================================================================== --- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java (original) +++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java Mon Feb 10 11:32:16 2014 @@ -410,9 +410,9 @@ public abstract class BaseGenericObjectP * performed for a run will be the minimum of the configured value and the * number of idle instances in the pool. When negative, the number of tests * performed will be ceil({@link #getNumIdle}/ - * abs({@link #getNumTestsPerEvictionRun})) which means that when the value - * is -n roughly one nth of the idle objects will be tested per - * run. + * abs({@link #getNumTestsPerEvictionRun})) which means that when the + * value is -n roughly one nth of the idle objects will be + * tested per run. * * @return max number of objects to examine during each evictor run * @@ -429,9 +429,9 @@ public abstract class BaseGenericObjectP * performed for a run will be the minimum of the configured value and the * number of idle instances in the pool. When negative, the number of tests * performed will be ceil({@link #getNumIdle}/ - * abs({@link #getNumTestsPerEvictionRun})) which means that when the value - * is -n roughly one nth of the idle objects will be tested per - * run. + * abs({@link #getNumTestsPerEvictionRun})) which means that when the + * value is -n roughly one nth of the idle objects will be + * tested per run. * * @param numTestsPerEvictionRun * max number of objects to examine during each evictor run Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java?rev=1566584&r1=1566583&r2=1566584&view=diff ============================================================================== --- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java (original) +++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java Mon Feb 10 11:32:16 2014 @@ -326,7 +326,10 @@ public class GenericKeyedObjectPool * @return object instance from the keyed pool * * @throws NoSuchElementException if a keyed object instance cannot be - * returned. + * returned because the pool is exhausted. + * + * @throws Exception if a keyed object instance cannot be returned due to an + * error */ public T borrowObject(K key, long borrowMaxWaitMillis) throws Exception { assertOpen(); @@ -1218,6 +1221,9 @@ public class GenericKeyedObjectPool * {@link #getMinIdlePerKey()} idle instances are created. * * @param key - The key to register for pool control. + * + * @throws Exception If the associated factory fails to create the necessary + * number of idle instances */ public void preparePool(K key) throws Exception { int minIdlePerKeySave = getMinIdlePerKey(); Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java?rev=1566584&r1=1566583&r2=1566584&view=diff ============================================================================== --- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java (original) +++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java Mon Feb 10 11:32:16 2014 @@ -400,6 +400,9 @@ public class GenericObjectPool extend * @return object instance from the pool * * @throws NoSuchElementException if an instance cannot be returned + * + * @throws Exception if an object instance cannot be returned due to an + * error */ public T borrowObject(long borrowMaxWaitMillis) throws Exception { assertOpen(); Modified: commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java?rev=1566584&r1=1566583&r2=1566584&view=diff ============================================================================== --- commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java (original) +++ commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java Mon Feb 10 11:32:16 2014 @@ -403,7 +403,8 @@ public class SoftReferenceObjectPool * references pools. * * @param toDestroy PooledSoftReference to destroy - * @throws Exception + * + * @throws Exception If an error occurs while trying to destroy the object */ private void destroy(PooledSoftReference toDestroy) throws Exception { toDestroy.invalidate(); Modified: commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java?rev=1566584&r1=1566583&r2=1566584&view=diff ============================================================================== --- commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java (original) +++ commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestBaseObjectPool.java Mon Feb 10 11:32:16 2014 @@ -30,7 +30,9 @@ public class TestBaseObjectPool extends private ObjectPool _pool = null; /** - * @param mincapacity + * @param mincapacity Ignored by this implemented. Used by sub-classes. + * + * @return A newly created empty pool */ protected ObjectPool makeEmptyPool(int mincapacity) { if (this.getClass() != TestBaseObjectPool.class) { @@ -48,7 +50,9 @@ public class TestBaseObjectPool extends } /** - * @param n + * @param n Ignored by this implemented. Used by sub-classes. + * + * @return the Nth object (zero indexed) */ protected Object getNthObject(final int n) { if (this.getClass() != TestBaseObjectPool.class) { Modified: commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java?rev=1566584&r1=1566583&r2=1566584&view=diff ============================================================================== --- commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java (original) +++ commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestKeyedObjectPool.java Mon Feb 10 11:32:16 2014 @@ -39,8 +39,12 @@ public abstract class TestKeyedObjectPoo * The pool should be in a default configuration and conform to the expected * behaviors described in {@link KeyedObjectPool}. * Generally speaking there should be no limits on the various object counts. + * + * @param factory Factory to use to associate with the pool + * @return The newly created empty pool */ - protected abstract KeyedObjectPool makeEmptyPool(KeyedPooledObjectFactory factory); + protected abstract KeyedObjectPool makeEmptyPool( + KeyedPooledObjectFactory factory); protected static final String KEY = "key"; @@ -63,7 +67,9 @@ public abstract class TestKeyedObjectPoo * idle and active objects, or * throw {@link IllegalArgumentException} * if such a pool cannot be created. - * @param mincapacity + * @param mincapacity Minimum capacity of the pool to create + * + * @return the newly created keyed object pool */ protected abstract KeyedObjectPool makeEmptyPool(int mincapacity); @@ -71,8 +77,10 @@ public abstract class TestKeyedObjectPoo * Return what we expect to be the nth * object (zero indexed) created by the pool * for the given key. - * @param key - * @param n + * @param key Key for the object to be obtained + * @param n index of the object to be obtained + * + * @return the requested object */ protected abstract Object getNthObject(Object key, int n); Modified: commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestObjectPool.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestObjectPool.java?rev=1566584&r1=1566583&r2=1566584&view=diff ============================================================================== --- commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestObjectPool.java (original) +++ commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/TestObjectPool.java Mon Feb 10 11:32:16 2014 @@ -41,7 +41,13 @@ public abstract class TestObjectPool { * The pool should be in a default configuration and conform to the expected * behaviors described in {@link ObjectPool}. * Generally speaking there should be no limits on the various object counts. - * @throws UnsupportedOperationException if the pool being tested does not follow pool contracts. + * + * @param factory The factory to be used by the object pool + * + * @return the newly created empty pool + * + * @throws UnsupportedOperationException if the pool being tested does not + * follow pool contracts. */ protected abstract ObjectPool makeEmptyPool(PooledObjectFactory factory) throws UnsupportedOperationException; Modified: commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java?rev=1566584&r1=1566583&r2=1566584&view=diff ============================================================================== --- commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java (original) +++ commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestAbandonedObjectPool.java Mon Feb 10 11:32:16 2014 @@ -84,10 +84,11 @@ public class TestAbandonedObjectPool { } /** - * Tests fix for Bug 28579, a bug in AbandonedObjectPool that causes numActive to go negative - * in GenericObjectPool - * - */ + * Tests fix for Bug 28579, a bug in AbandonedObjectPool that causes numActive to go negative + * in GenericObjectPool + * + * @throws Exception May occur in some failure modes + */ @Test public void testConcurrentInvalidation() throws Exception { final int POOL_SIZE = 30; @@ -135,6 +136,8 @@ public class TestAbandonedObjectPool { * Verify that an object that gets flagged as abandoned and is subsequently returned * is destroyed instead of being returned to the pool (and possibly later destroyed * inappropriately). + * + * @throws Exception May occur in some failure modes */ @Test public void testAbandonedReturn() throws Exception { @@ -170,6 +173,8 @@ public class TestAbandonedObjectPool { /** * Verify that an object that gets flagged as abandoned and is subsequently * invalidated is only destroyed (and pool counter decremented) once. + * + * @throws Exception May occur in some failure modes */ @Test public void testAbandonedInvalidate() throws Exception { @@ -199,6 +204,8 @@ public class TestAbandonedObjectPool { /** * Verify that an object that the evictor identifies as abandoned while it * is in process of being returned to the pool is not destroyed. + * + * @throws Exception May occur in some failure modes */ @Test public void testRemoveAbandonedWhileReturning() throws Exception { @@ -232,6 +239,8 @@ public class TestAbandonedObjectPool { * further object which should block until the abandoned objects are * removed. We don't want the test to block indefinitely when it fails so * use maxWait be check we don't actually have to wait that long. + * + * @throws Exception May occur in some failure modes */ @Test public void testWhenExhaustedBlock() throws Exception { Modified: commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java?rev=1566584&r1=1566583&r2=1566584&view=diff ============================================================================== --- commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java (original) +++ commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericKeyedObjectPool.java Mon Feb 10 11:32:16 2014 @@ -508,9 +508,15 @@ public class TestGenericKeyedObjectPool } /** - * Kicks off test threads, each of which will go through - * borrow-return cycles with random delay times <= delay - * in between. + * Kicks off numThreads test threads, each of which will go + * through iterations borrow-return cycles with random delay + * times <= delay in between. + * + * @param Type of object in pool + * @param numThreads Number of test threads + * @param iterations Number of iterations for each thread + * @param delay Maximum delay between iterations + * @param gkopPool The keyed object pool to use */ public void runTestThreads(int numThreads, int iterations, int delay, GenericKeyedObjectPool gkopPool) { ArrayList> threads = new ArrayList>(); @@ -547,6 +553,8 @@ public class TestGenericKeyedObjectPool * Verifies that maxTotal is not exceeded when factory destroyObject * has high latency, testOnReturn is set and there is high incidence of * validation failures. + * + * @throws Exception May occur in some failure modes */ @Test(timeout=60000) public void testMaxTotalInvariant() throws Exception { @@ -718,6 +726,8 @@ public class TestGenericKeyedObjectPool * regardless of FIFO/LIFO * * JIRA: POOL-86 + * + * @throws Exception May occur in some failure modes */ @Test(timeout=60000) public void testEvictionOrder() throws Exception { @@ -842,6 +852,8 @@ public class TestGenericKeyedObjectPool /** * Verifies that the evictor visits objects in expected order * and frequency. + * + * @throws Exception May occur in some failure modes */ @Test(timeout=60000) public void testEvictorVisiting() throws Exception { @@ -1275,6 +1287,8 @@ public class TestGenericKeyedObjectPool /** * Test case for POOL-180. + * + * @throws Exception May occur in some failure modes */ @Test(timeout=200000) public void testMaxActivePerKeyExceeded() throws Exception { @@ -1294,6 +1308,8 @@ public class TestGenericKeyedObjectPool /** * Test to make sure that clearOldest does not destroy instances that have been checked out. + * + * @throws Exception May occur in some failure modes */ @Test(timeout=60000) public void testClearOldest() throws Exception { @@ -1330,6 +1346,8 @@ public class TestGenericKeyedObjectPool /** * Verifies that threads that get parked waiting for keys not in use * when the pool is at maxTotal eventually get served. + * + * @throws Exception May occur in some failure modes */ @Test(timeout=60000) public void testLivenessPerKey() throws Exception { @@ -1354,6 +1372,8 @@ public class TestGenericKeyedObjectPool /** * POOL-192 * Verify that clear(key) does not leak capacity. + * + * @throws Exception May occur in some failure modes */ @Test(timeout=60000) public void testClear() throws Exception { @@ -1380,6 +1400,8 @@ public class TestGenericKeyedObjectPool /** * POOL-189 + * + * @throws Exception May occur in some failure modes */ @Test(timeout=60000) public void testWhenExhaustedBlockClosePool() throws Exception { @@ -1410,6 +1432,8 @@ public class TestGenericKeyedObjectPool /** * POOL-231 - verify that concurrent invalidates of the same object do not * corrupt pool destroyCount. + * + * @throws Exception May occur in some failure modes */ @Test public void testConcurrentInvalidate() throws Exception { @@ -1784,6 +1808,8 @@ public class TestGenericKeyedObjectPool * is invalidated. * * JIRA: POOL-240 + * + * @throws Exception May occur in some failure modes */ @Test public void testInvalidateWaiting() @@ -1863,6 +1889,8 @@ public class TestGenericKeyedObjectPool * invalidated. * * JIRA: POOL-240 + * + * @throws Exception May occur in some failure modes */ @Test public void testInvalidateFreesCapacity() @@ -1893,6 +1921,8 @@ public class TestGenericKeyedObjectPool * validation. * * JIRA: POOL-240 + * + * @throws Exception May occur in some failure modes */ @Test public void testValidationFailureOnReturnFreesCapacity() @@ -1921,6 +1951,8 @@ public class TestGenericKeyedObjectPool * Verify that factory exceptions creating objects do not corrupt per key create count. * * JIRA: POOL-243 + * + * @throws Exception May occur in some failure modes */ @Test public void testMakeObjectException() Modified: commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java?rev=1566584&r1=1566583&r2=1566584&view=diff ============================================================================== --- commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java (original) +++ commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java Mon Feb 10 11:32:16 2014 @@ -276,7 +276,9 @@ public class TestGenericObjectPool exten /** * Tests addObject contention between ensureMinIdle triggered by - * the Evictor with minIdle > 0 and borrowObject. + * the Evictor with minIdle > 0 and borrowObject. + * + * @throws Exception May occur in some failure modes */ @Test(timeout=60000) public void testEvictAddObjects() throws Exception { @@ -335,6 +337,8 @@ public class TestGenericObjectPool exten * regardless of FIFO/LIFO. * * JIRA: POOL-86 + * + * @throws Exception May occur in some failure modes */ @Test(timeout=60000) public void testEvictionOrder() throws Exception { @@ -386,6 +390,8 @@ public class TestGenericObjectPool exten /** * Verifies that the evictor visits objects in expected order * and frequency. + * + * @throws Exception May occur in some failure modes */ @Test public void testEvictorVisiting() throws Exception { @@ -1145,6 +1151,8 @@ public class TestGenericObjectPool exten /** * POOL-231 - verify that concurrent invalidates of the same object do not * corrupt pool destroyCount. + * + * @throws Exception May occur in some failure modes */ @Test public void testConcurrentInvalidate() throws Exception { @@ -1340,6 +1348,8 @@ public class TestGenericObjectPool exten * Verifies that maxTotal is not exceeded when factory destroyObject * has high latency, testOnReturn is set and there is high incidence of * validation failures. + * + * @throws Exception May occur in some failure modes */ @Test(timeout=60000) public void testMaxTotalInvariant() throws Exception { @@ -1384,6 +1394,8 @@ public class TestGenericObjectPool exten /** * POOL-189 + * + * @throws Exception May occur in some failure modes */ @Test(timeout=60000) public void testWhenExhaustedBlockClosePool() throws Exception { @@ -1972,6 +1984,8 @@ public class TestGenericObjectPool exten * Thread 2 starts to borrow another instance before thread 1 returns its instance * Thread 1 returns its instance while thread 2 is validating its newly created instance * The test verifies that the instance created by Thread 2 is not leaked. + * + * @throws Exception May occur in some failure modes */ @Test(timeout=60000) public void testMakeConcurrentWithReturn() throws Exception { @@ -2018,6 +2032,8 @@ public class TestGenericObjectPool exten * invalidated. * * JIRA: POOL-240 + * + * @throws Exception May occur in some failure modes */ @Test public void testInvalidateFreesCapacity() @@ -2048,6 +2064,8 @@ public class TestGenericObjectPool exten * validation. * * JIRA: POOL-240 + * + * @throws Exception May occur in some failure modes */ @Test public void testValidationFailureOnReturnFreesCapacity() Modified: commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java?rev=1566584&r1=1566583&r2=1566584&view=diff ============================================================================== --- commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java (original) +++ commons/proper/pool/trunk/src/test/java/org/apache/commons/pool2/impl/TestSoftRefOutOfMemory.java Mon Feb 10 11:32:16 2014 @@ -159,6 +159,8 @@ public class TestSoftRefOutOfMemory { /** * Makes sure an {@link OutOfMemoryError} isn't swallowed. + * + * @throws Exception May occur in some failure modes */ @Test public void testOutOfMemoryError() throws Exception {