Author: sebb
Date: Tue Oct 12 18:41:44 2010
New Revision: 1021881
URL: http://svn.apache.org/viewvc?rev=1021881&view=rev
Log:
Remove references to setFactory
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java?rev=1021881&r1=1021880&r2=1021881&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericKeyedObjectPool.java
Tue Oct 12 18:41:44 2010
@@ -185,8 +185,7 @@ import org.apache.commons.pool.PoolUtils
* </ul>
* <p>
* GenericKeyedObjectPool is not usable without a {...@link
KeyedPoolableObjectFactory}. A
- * non-<code>null</code> factory must be provided either as a constructor
argument
- * or via a call to {...@link #setFactory setFactory} before the pool is used.
+ * non-<code>null</code> factory must be provided as a constructor argument
* </p>
* <p>
* Implementation note: To prevent possible deadlocks, care has been taken to
@@ -318,7 +317,6 @@ public class GenericKeyedObjectPool<K,V>
* Create a new <code>GenericKeyedObjectPool</code> with no factory.
*
* @see #GenericKeyedObjectPool(KeyedPoolableObjectFactory)
- * @see #setFactory(KeyedPoolableObjectFactory)
*/
public GenericKeyedObjectPool() {
this(null, DEFAULT_MAX_ACTIVE, DEFAULT_WHEN_EXHAUSTED_ACTION,
DEFAULT_MAX_WAIT, DEFAULT_MAX_IDLE,
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java?rev=1021881&r1=1021880&r2=1021881&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/GenericObjectPool.java
Tue Oct 12 18:41:44 2010
@@ -172,8 +172,7 @@ import org.apache.commons.pool.impl.Gene
* </ul>
* <p>
* GenericObjectPool is not usable without a {...@link PoolableObjectFactory}.
A
- * non-<code>null</code> factory must be provided either as a constructor
argument
- * or via a call to {...@link #setFactory} before the pool is used.
+ * non-<code>null</code> factory must be provided as a constructor argument
* <p>
* Implementation note: To prevent possible deadlocks, care has been taken to
* ensure that no call to a factory method will occur within a synchronization
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java?rev=1021881&r1=1021880&r2=1021881&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool/impl/StackKeyedObjectPool.java
Tue Oct 12 18:41:44 2010
@@ -54,7 +54,6 @@ public class StackKeyedObjectPool<K,V> e
* before they can be {...@link #borrowObject borrowed}.
*
* @see #StackKeyedObjectPool(KeyedPoolableObjectFactory)
- * @see #setFactory(KeyedPoolableObjectFactory)
*/
public StackKeyedObjectPool() {
this((KeyedPoolableObjectFactory<K,V>)null,DEFAULT_MAX_SLEEPING,DEFAULT_INIT_SLEEPING_CAPACITY);
@@ -68,7 +67,6 @@ public class StackKeyedObjectPool<K,V> e
*
* @param max cap on the number of "sleeping" instances in the pool
* @see #StackKeyedObjectPool(KeyedPoolableObjectFactory, int)
- * @see #setFactory(KeyedPoolableObjectFactory)
*/
public StackKeyedObjectPool(int max) {
this((KeyedPoolableObjectFactory<K,V>)null,max,DEFAULT_INIT_SLEEPING_CAPACITY);
@@ -84,7 +82,6 @@ public class StackKeyedObjectPool<K,V> e
* @param init initial size of the pool (this specifies the size of the
container,
* it does not cause the pool to be pre-populated.)
* @see #StackKeyedObjectPool(KeyedPoolableObjectFactory, int, int)
- * @see #setFactory(KeyedPoolableObjectFactory)
*/
public StackKeyedObjectPool(int max, int init) {
this((KeyedPoolableObjectFactory<K,V>)null,max,init);
@@ -272,7 +269,7 @@ public class StackKeyedObjectPool<K,V> e
*
* @param key the key a new instance should be added to
* @throws Exception when {...@link KeyedPoolableObjectFactory#makeObject}
fails.
- * @throws IllegalStateException when no {...@link #setFactory factory}
has been set or after {...@link #close} has been called on this pool.
+ * @throws IllegalStateException when no {...@link #_factory} has been set
or after {...@link #close} has been called on this pool.
*/
@Override
public synchronized void addObject(K key) throws Exception {
