Author: simonetripodi
Date: Tue Oct 19 19:24:04 2010
New Revision: 1024369
URL: http://svn.apache.org/viewvc?rev=1024369&view=rev
Log:
removed trailing spaces on empty lines
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BasePoolableObjectFactory.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/PoolUtils.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/EvictionTimer.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolFactory.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPoolFactory.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPoolFactory.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackObjectPool.java
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackObjectPoolFactory.java
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedObjectPool.java?rev=1024369&r1=1024368&r2=1024369&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseKeyedObjectPool.java
Tue Oct 19 19:24:04 2010
@@ -28,17 +28,16 @@ package org.apache.commons.pool2;
* @since Pool 1.0
*/
public abstract class BaseKeyedObjectPool<K,V> implements KeyedObjectPool<K,V>
{
-
/**
* {...@inheritdoc}
*/
public abstract V borrowObject(K key) throws Exception;
-
+
/**
* {...@inheritdoc}
*/
public abstract void returnObject(K key, V obj) throws Exception;
-
+
/**
* <p>Invalidates an object from the pool.</p>
*
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseObjectPool.java?rev=1024369&r1=1024368&r2=1024369&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BaseObjectPool.java
Tue Oct 19 19:24:04 2010
@@ -35,14 +35,14 @@ public abstract class BaseObjectPool<T>
* @throws Exception if an instance cannot be obtained from the pool
*/
public abstract T borrowObject() throws Exception;
-
+
/**
* Returns an instance to the pool.
*
* @param obj instance to return to the pool
*/
public abstract void returnObject(T obj) throws Exception;
-
+
/**
* <p>Invalidates an object from the pool.</p>
*
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BasePoolableObjectFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BasePoolableObjectFactory.java?rev=1024369&r1=1024368&r2=1024369&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BasePoolableObjectFactory.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/BasePoolableObjectFactory.java
Tue Oct 19 19:24:04 2010
@@ -30,7 +30,6 @@ package org.apache.commons.pool2;
* @since Pool 1.0
*/
public abstract class BasePoolableObjectFactory<T> implements
PoolableObjectFactory<T> {
-
/**
* {...@inheritdoc}
*/
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/PoolUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/PoolUtils.java?rev=1024369&r1=1024368&r2=1024369&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/java/org/apache/commons/pool2/PoolUtils.java
(original)
+++ commons/proper/pool/trunk/src/java/org/apache/commons/pool2/PoolUtils.java
Tue Oct 19 19:24:04 2010
@@ -572,7 +572,7 @@ public final class PoolUtils {
private static class PoolableObjectFactoryAdaptor<K,V> implements
PoolableObjectFactory<V> {
/** Fixed key */
private final K key;
-
+
/** Wrapped factory */
private final KeyedPoolableObjectFactory<K,V> keyedFactory;
@@ -661,7 +661,7 @@ public final class PoolUtils {
* ignoring keys.
*/
private static class KeyedPoolableObjectFactoryAdaptor<K,V> implements
KeyedPoolableObjectFactory<K,V> {
-
+
/** Underlying PoolableObjectFactory */
private final PoolableObjectFactory<V> factory;
@@ -748,10 +748,10 @@ public final class PoolUtils {
* a fixed key.
*/
private static class ObjectPoolAdaptor<K,V> implements ObjectPool<V> {
-
+
/** Fixed key */
private final K key;
-
+
/** Underlying KeyedObjectPool */
private final KeyedObjectPool<K,V> keyedPool;
@@ -859,7 +859,7 @@ public final class PoolUtils {
* Adapts an ObjectPool to implement KeyedObjectPool by ignoring key
arguments.
*/
private static class KeyedObjectPoolAdaptor<K,V> implements
KeyedObjectPool<K,V> {
-
+
/** Underlying pool */
private final ObjectPool<V> pool;
@@ -1008,7 +1008,7 @@ public final class PoolUtils {
* the underlying pool's associated object factory.
*/
private final Class<?> type;
-
+
/** Underlying object pool */
private final ObjectPool<? super Object> pool;
@@ -1146,7 +1146,7 @@ public final class PoolUtils {
* a subtype of the return type of the object factory used by the pool.
*/
private final Class<?> type;
-
+
/** Underlying pool */
private final KeyedObjectPool<? super Object,? super Object> keyedPool;
@@ -1228,7 +1228,7 @@ public final class PoolUtils {
public void addObject(final Object key) throws Exception,
IllegalStateException, UnsupportedOperationException {
keyedPool.addObject(key);
}
-
+
/**
* {...@inheritdoc}
*/
@@ -1303,10 +1303,10 @@ public final class PoolUtils {
*
*/
private static class ObjectPoolMinIdleTimerTask<T> extends TimerTask {
-
+
/** Minimum number of idle instances. Not the same as
pool.getMinIdle(). */
private final int minIdle;
-
+
/** Object pool */
private final ObjectPool<T> pool;
@@ -1371,10 +1371,10 @@ public final class PoolUtils {
private static class KeyedObjectPoolMinIdleTimerTask<K,V> extends
TimerTask {
/** Minimum number of idle instances. Not the same as
pool.getMinIdle(). */
private final int minIdle;
-
+
/** Key to ensure minIdle for */
private final K key;
-
+
/** Keyed object pool */
private final KeyedObjectPool<K,V> keyedPool;
@@ -1444,10 +1444,10 @@ public final class PoolUtils {
* </p>
*/
private static class SynchronizedObjectPool<T> implements ObjectPool<T> {
-
+
/** Object whose monitor is used to synchronize methods on the wrapped
pool. */
private final Object lock;
-
+
/** the underlying object pool */
private final ObjectPool<T> pool;
@@ -1573,10 +1573,10 @@ public final class PoolUtils {
* </p>
*/
private static class SynchronizedKeyedObjectPool<K,V> implements
KeyedObjectPool<K,V> {
-
+
/** Object whose monitor is used to synchronize methods on the wrapped
pool. */
private final Object lock;
-
+
/** Underlying object pool */
private final KeyedObjectPool<K,V> keyedPool;
@@ -1729,7 +1729,7 @@ public final class PoolUtils {
private static class SynchronizedPoolableObjectFactory<T> implements
PoolableObjectFactory<T> {
/** Synchronization lock */
private final Object lock;
-
+
/** Wrapped factory */
private final PoolableObjectFactory<T> factory;
@@ -1816,7 +1816,7 @@ public final class PoolUtils {
private static class SynchronizedKeyedPoolableObjectFactory<K,V>
implements KeyedPoolableObjectFactory<K,V> {
/** Synchronization lock */
private final Object lock;
-
+
/** Wrapped factory */
private final KeyedPoolableObjectFactory<K,V> keyedFactory;
@@ -1904,10 +1904,10 @@ public final class PoolUtils {
private static class ErodingFactor {
/** Determines frequency of "erosion" events */
private final float factor;
-
+
/** Time of next shrink event */
private transient volatile long nextShrink;
-
+
/** High water mark - largest numIdle encountered */
private transient volatile int idleHighWaterMark;
@@ -1975,7 +1975,7 @@ public final class PoolUtils {
private static class ErodingObjectPool<T> implements ObjectPool<T> {
/** Underlying object pool */
private final ObjectPool<T> pool;
-
+
/** Erosion factor */
private final ErodingFactor factor;
@@ -2102,7 +2102,7 @@ public final class PoolUtils {
private static class ErodingKeyedObjectPool<K,V> implements
KeyedObjectPool<K,V> {
/** Underlying pool */
private final KeyedObjectPool<K,V> keyedPool;
-
+
/** Erosion factor */
private final ErodingFactor erodingFactor;
@@ -2285,7 +2285,7 @@ public final class PoolUtils {
private static class ErodingPerKeyKeyedObjectPool<K,V> extends
ErodingKeyedObjectPool<K,V> {
/** Erosion factor - same for all pools */
private final float factor;
-
+
/** Map of ErodingFactor instances keyed on pool keys */
private final Map<K,ErodingFactor> factors =
Collections.synchronizedMap(new HashMap<K,ErodingFactor>());
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/EvictionTimer.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/EvictionTimer.java?rev=1024369&r1=1024368&r2=1024369&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/EvictionTimer.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/EvictionTimer.java
Tue Oct 19 19:24:04 2010
@@ -37,10 +37,10 @@ import java.util.TimerTask;
* </p>
*/
class EvictionTimer {
-
+
/** Timer instance */
private static Timer _timer; //@GuardedBy("this")
-
+
/** Static usage count tracker */
private static int _usageCount; //@GuardedBy("this")
@@ -88,7 +88,7 @@ class EvictionTimer {
_timer = null;
}
}
-
+
/**
* {...@link PrivilegedAction} used to get the ContextClassLoader
*/
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=1024369&r1=1024368&r2=1024369&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 Oct 19 19:24:04 2010
@@ -1188,9 +1188,9 @@ public class GenericKeyedObjectPool<K,V>
synchronized (this) {
if (isClosed()) return;
-
+
Iterator<Latch> allocationQueueIter = _allocationQueue.iterator();
-
+
while (allocationQueueIter.hasNext()) {
// First use any objects in the pool to clear the queue
Latch latch = allocationQueueIter.next();
@@ -1243,7 +1243,7 @@ public class GenericKeyedObjectPool<K,V>
}
}
}
-
+
if (clearOldest) {
/* Clear oldest calls factory methods so it must be called from
* outside the sync block.
@@ -1256,7 +1256,7 @@ public class GenericKeyedObjectPool<K,V>
clearOldest();
}
}
-
+
/**
* Clears any objects sitting idle in the pool by removing them from the
* idle instance pool and then invoking the configured
PoolableObjectFactory's
@@ -2052,10 +2052,10 @@ public class GenericKeyedObjectPool<K,V>
private class ObjectQueue {
/** Number of instances checked out to clients from this queue */
private int activeCount = 0;
-
+
/** Idle instance queue */
private final CursorableLinkedList<ObjectTimestampPair<V>> queue = new
CursorableLinkedList<ObjectTimestampPair<V>>();
-
+
/** Number of instances in process of being created */
private int internalProcessingCount = 0;
@@ -2107,7 +2107,7 @@ public class GenericKeyedObjectPool<K,V>
* Object instance.
*/
private final V value;
-
+
/**
* timestamp
*/
@@ -2277,16 +2277,16 @@ public class GenericKeyedObjectPool<K,V>
* @since 1.5
*/
private final class Latch {
-
+
/** key of associated pool */
private final K _key;
-
+
/** keyed pool associated with this latch */
private ObjectQueue _pool;
-
+
/** holds an ObjectTimestampPair when this latch has been allocated an
instance */
private ObjectTimestampPair<V> _pair;
-
+
/** indicates that this latch can create an instance */
private boolean _mayCreate = false;
@@ -2313,7 +2313,7 @@ public class GenericKeyedObjectPool<K,V>
private synchronized ObjectQueue getPool() {
return _pool;
}
-
+
/**
* Sets the pool associated with this latch
* @param pool the pool
@@ -2330,7 +2330,7 @@ public class GenericKeyedObjectPool<K,V>
private synchronized ObjectTimestampPair<V> getPair() {
return _pair;
}
-
+
/**
* Allocate an ObjectTimestampPair to this latch.
* @param pair ObjectTimestampPair on this latch
@@ -2346,7 +2346,7 @@ public class GenericKeyedObjectPool<K,V>
private synchronized boolean mayCreate() {
return _mayCreate;
}
-
+
/**
* Sets the mayCreate property
*
@@ -2535,7 +2535,7 @@ public class GenericKeyedObjectPool<K,V>
/** Eviction cursor (over instances within-key) */
private CursorableLinkedList<ObjectTimestampPair<V>>.Cursor
_evictionCursor = null;
-
+
/** Eviction cursor (over keys) */
private CursorableLinkedList<K>.Cursor _evictionKeyCursor = null;
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolFactory.java?rev=1024369&r1=1024368&r2=1024369&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolFactory.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolFactory.java
Tue Oct 19 19:24:04 2010
@@ -248,7 +248,7 @@ public class GenericKeyedObjectPoolFacto
public KeyedObjectPool<K,V> createPool() {
return new
GenericKeyedObjectPool<K,V>(_factory,_maxActive,_whenExhaustedAction,_maxWait,_maxIdle,_maxTotal,_minIdle,_testOnBorrow,_testOnReturn,_timeBetweenEvictionRunsMillis,_numTestsPerEvictionRun,_minEvictableIdleTimeMillis,_testWhileIdle,_lifo);
}
-
+
/**
* @return the {...@link GenericKeyedObjectPool#getMaxIdle() maxIdle}
setting for pools created by this factory.
* @since 1.5.5
@@ -371,82 +371,82 @@ public class GenericKeyedObjectPoolFacto
* @deprecated to be removed in pool 2.0. Use {...@link #getMaxIdle()}.
*/
protected int _maxIdle = GenericKeyedObjectPool.DEFAULT_MAX_IDLE;
-
+
/**
* The {...@link GenericKeyedObjectPool#getMaxActive() maxActive} setting
for pools created by this factory.
* @deprecated to be removed in pool 2.0. Use {...@link #getMaxActive()}.
*/
protected int _maxActive = GenericKeyedObjectPool.DEFAULT_MAX_ACTIVE;
-
+
/**
* The {...@link GenericKeyedObjectPool#getMaxTotal() maxTotal} setting
for pools created by this factory.
* @deprecated to be removed in pool 2.0. Use {...@link #getMaxTotal()}.
*/
protected int _maxTotal = GenericKeyedObjectPool.DEFAULT_MAX_TOTAL;
-
+
/**
* The {...@link GenericKeyedObjectPool#getMinIdle() minIdle} setting for
pools created by this factory.
* @deprecated to be removed in pool 2.0. Use {...@link #getMinIdle()}.
*/
protected int _minIdle = GenericKeyedObjectPool.DEFAULT_MIN_IDLE;
-
+
/**
* The {...@link GenericKeyedObjectPool#getMaxWait() maxWait} setting for
pools created by this factory.
* @deprecated to be removed in pool 2.0. Use {...@link #getMaxWait()}.
*/
protected long _maxWait = GenericKeyedObjectPool.DEFAULT_MAX_WAIT;
-
+
/**
* The {...@link GenericKeyedObjectPool#getWhenExhaustedAction()
whenExhaustedAction} setting for pools created by this factory.
* @deprecated to be removed in pool 2.0. Use {...@link
#getWhenExhaustedAction()}.
*/
protected WhenExhaustedAction _whenExhaustedAction =
GenericKeyedObjectPool.DEFAULT_WHEN_EXHAUSTED_ACTION;
-
+
/**
* The {...@link GenericKeyedObjectPool#getTestOnBorrow() testOnBorrow}
setting for pools created by this factory.
* @deprecated to be removed in pool 2.0. Use {...@link
#getTestOnBorrow()}.
*/
protected boolean _testOnBorrow =
GenericKeyedObjectPool.DEFAULT_TEST_ON_BORROW;
-
+
/**
* The {...@link GenericKeyedObjectPool#getTestOnReturn() testOnReturn}
setting for pools created by this factory.
* @deprecated to be removed in pool 2.0. Use {...@link
#getTestOnReturn()}.
*/
protected boolean _testOnReturn =
GenericKeyedObjectPool.DEFAULT_TEST_ON_RETURN;
-
+
/**
* The {...@link GenericKeyedObjectPool#getTestWhileIdle() testWhileIdle}
setting for pools created by this factory.
* @deprecated to be removed in pool 2.0. Use {...@link
#getTestWhileIdle()}.
*/
protected boolean _testWhileIdle =
GenericKeyedObjectPool.DEFAULT_TEST_WHILE_IDLE;
-
+
/**
* The {...@link GenericKeyedObjectPool#getTimeBetweenEvictionRunsMillis()
timeBetweenEvictionRunsMillis} setting for
* pools created by this factory.
* @deprecated to be removed in pool 2.0. Use {...@link
#getTimeBetweenEvictionRunsMillis()}.
*/
protected long _timeBetweenEvictionRunsMillis =
GenericKeyedObjectPool.DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS;
-
+
/**
* The {...@link GenericKeyedObjectPool#getNumTestsPerEvictionRun()
numTestsPerEvictionRun} setting for
* pools created by this factory.
* @deprecated to be removed in pool 2.0. Use {...@link
#getNumTestsPerEvictionRun()}.
*/
protected int _numTestsPerEvictionRun =
GenericKeyedObjectPool.DEFAULT_NUM_TESTS_PER_EVICTION_RUN;
-
+
/**
* The {...@link GenericKeyedObjectPool#getMinEvictableIdleTimeMillis()
minEvictableIdleTimeMillis} setting for
* pools created by this factory.
* @deprecated to be removed in pool 2.0. Use {...@link
#getMinEvictableIdleTimeMillis()}.
*/
protected long _minEvictableIdleTimeMillis =
GenericKeyedObjectPool.DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS;
-
+
/**
* The {...@link KeyedPoolableObjectFactory} used by pools created by this
factory.
* @deprecated to be removed in pool 2.0. Use {...@link #getFactory()}.
*/
protected KeyedPoolableObjectFactory<K,V> _factory = null;
-
+
/**
* The {...@link GenericKeyedObjectPool#getLifo() lifo} setting for pools
created by this factory.
* @deprecated to be removed in pool 2.0. Use {...@link #getLifo()}.
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java?rev=1024369&r1=1024368&r2=1024369&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPool.java
Tue Oct 19 19:24:04 2010
@@ -1714,10 +1714,10 @@ public class GenericObjectPool<T> extend
* threads request objects.
*/
private final class Latch {
-
+
/** object timestamp pair allocated to this latch */
private ObjectTimestampPair<T> _pair;
-
+
/** Whether or not this latch may create an object instance */
private boolean _mayCreate = false;
@@ -1728,7 +1728,7 @@ public class GenericObjectPool<T> extend
private synchronized ObjectTimestampPair<T> getPair() {
return _pair;
}
-
+
/**
* Sets ObjectTimestampPair on this latch
* @param pair ObjectTimestampPair allocated to this latch
@@ -1744,7 +1744,7 @@ public class GenericObjectPool<T> extend
private synchronized boolean mayCreate() {
return _mayCreate;
}
-
+
/**
* Sets the mayCreate property
* @param mayCreate new value for mayCreate
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPoolFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPoolFactory.java?rev=1024369&r1=1024368&r2=1024369&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPoolFactory.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPoolFactory.java
Tue Oct 19 19:24:04 2010
@@ -231,7 +231,6 @@ public class GenericObjectPoolFactory<T>
return new
GenericObjectPool<T>(_factory,_maxActive,_whenExhaustedAction,_maxWait,_maxIdle,_minIdle,_testOnBorrow,_testOnReturn,_timeBetweenEvictionRunsMillis,_numTestsPerEvictionRun,_minEvictableIdleTimeMillis,_testWhileIdle,_softMinEvictableIdleTimeMillis,_lifo);
}
-
/**
* @return the {...@link GenericObjectPool#getMaxIdle() maxIdle} setting
for pools created by this factory.
* @since 1.5.5
@@ -467,72 +466,72 @@ public class GenericObjectPoolFactory<T>
* The {...@link GenericObjectPool#getMaxIdle() maxIdle} setting for pools
created by this factory.
*/
private int _maxIdle = GenericObjectPool.DEFAULT_MAX_IDLE; //
@GuardedBy("this")
-
+
/**
* The {...@link GenericObjectPool#getMinIdle() minIdle} setting for pools
created by this factory.
*/
private int _minIdle = GenericObjectPool.DEFAULT_MIN_IDLE; //
@GuardedBy("this")
-
+
/**
* The {...@link GenericObjectPool#getMaxActive() maxActive} setting for
pools created by this factory.
*/
private int _maxActive = GenericObjectPool.DEFAULT_MAX_ACTIVE; //
@GuardedBy("this")
-
+
/**
* The {...@link GenericObjectPool#getMaxWait() maxWait} setting for pools
created by this factory.
*/
private long _maxWait = GenericObjectPool.DEFAULT_MAX_WAIT; //
@GuardedBy("this")
-
+
/**
* The {...@link GenericObjectPool#getWhenExhaustedAction()
whenExhaustedAction} setting for pools
* created by this factory.
*/
private WhenExhaustedAction _whenExhaustedAction =
GenericObjectPool.DEFAULT_WHEN_EXHAUSTED_ACTION; // @GuardedBy("this")
-
+
/**
* The {...@link GenericObjectPool#getTestOnBorrow() testOnBorrow} setting
for pools created by this factory.
*/
private boolean _testOnBorrow = GenericObjectPool.DEFAULT_TEST_ON_BORROW;
// @GuardedBy("this")
-
+
/**
* The {...@link GenericObjectPool#getTestOnReturn() testOnReturn} setting
for pools created by this factory.
*/
private boolean _testOnReturn = GenericObjectPool.DEFAULT_TEST_ON_RETURN;
// @GuardedBy("this")
-
+
/**
* The {...@link GenericObjectPool#getTestWhileIdle() testWhileIdle}
setting for pools created by this factory.
*/
private boolean _testWhileIdle =
GenericObjectPool.DEFAULT_TEST_WHILE_IDLE; // @GuardedBy("this")
-
+
/**
* The {...@link GenericObjectPool#getTimeBetweenEvictionRunsMillis()
timeBetweenEvictionRunsMillis}
* setting for pools created by this factory.
*/
private long _timeBetweenEvictionRunsMillis =
GenericObjectPool.DEFAULT_TIME_BETWEEN_EVICTION_RUNS_MILLIS; //
@GuardedBy("this")
-
+
/**
* The {...@link GenericObjectPool#getNumTestsPerEvictionRun()
numTestsPerEvictionRun} setting
* for pools created by this factory.
*/
private int _numTestsPerEvictionRun =
GenericObjectPool.DEFAULT_NUM_TESTS_PER_EVICTION_RUN; // @GuardedBy("this")
-
+
/**
* The {...@link GenericObjectPool#getMinEvictableIdleTimeMillis()
minEvictableIdleTimeMillis}
* setting for pools created by this factory.
*/
private long _minEvictableIdleTimeMillis =
GenericObjectPool.DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS; // @GuardedBy("this")
-
+
/**
* The {...@link GenericObjectPool#getSoftMinEvictableIdleTimeMillis()
softMinEvictableIdleTimeMillis}
* setting for pools created by this factory.
*/
private long _softMinEvictableIdleTimeMillis =
GenericObjectPool.DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS; // @GuardedBy("this")
-
+
/**
* The {...@link GenericObjectPool#getLifo() lifo} setting for pools
created by this factory.
*/
private boolean _lifo = GenericObjectPool.DEFAULT_LIFO; //
@GuardedBy("this")
-
+
/**
* The {...@link PoolableObjectFactory} used by pools created by this
factory.
*/
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java?rev=1024369&r1=1024368&r2=1024369&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/SoftReferenceObjectPool.java
Tue Oct 19 19:24:04 2010
@@ -281,7 +281,7 @@ public class SoftReferenceObjectPool<T>
}
}
}
-
+
/**
* Returns the {...@link PoolableObjectFactory} used by this pool to
create and manage object instances.
*
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPool.java?rev=1024369&r1=1024368&r2=1024369&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPool.java
Tue Oct 19 19:24:04 2010
@@ -47,8 +47,6 @@ import org.apache.commons.pool2.PoolUtil
* @since Pool 1.0
*/
public class StackKeyedObjectPool<K,V> extends BaseKeyedObjectPool<K,V>
implements KeyedObjectPool<K,V> {
-
-
/**
* Create a new <code>SimpleKeyedObjectPool</code> using
* the specified <code>factory</code> to create new instances.
@@ -459,7 +457,6 @@ public class StackKeyedObjectPool<K,V> e
}
}
-
/**
* @return map of keyed pools
* @since 1.5.5
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPoolFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPoolFactory.java?rev=1024369&r1=1024368&r2=1024369&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPoolFactory.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackKeyedObjectPoolFactory.java
Tue Oct 19 19:24:04 2010
@@ -81,12 +81,12 @@ public class StackKeyedObjectPoolFactory
* KeyedPoolableObjectFactory used by StackKeyedObjectPools created by
this factory
*/
private final KeyedPoolableObjectFactory<K,V> _factory;
-
+
/**
* Maximum number of idle instances in each keyed pool for
StackKeyedObjectPools created by this factory
*/
private int _maxSleeping = StackKeyedObjectPool.DEFAULT_MAX_SLEEPING;
-
+
/**
* Initial capacity of StackKeyedObjectPools created by this factory.
*/
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackObjectPool.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackObjectPool.java?rev=1024369&r1=1024368&r2=1024369&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackObjectPool.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackObjectPool.java
Tue Oct 19 19:24:04 2010
@@ -358,7 +358,7 @@ public class StackObjectPool<T> extends
* The cap on the number of "sleeping" instances in the pool.
*/
private int _maxSleeping = DEFAULT_MAX_SLEEPING; // @GuardedBy("this")
-
+
/**
* Number of objects borrowed but not yet returned to the pool.
*/
Modified:
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackObjectPoolFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackObjectPoolFactory.java?rev=1024369&r1=1024368&r2=1024369&view=diff
==============================================================================
---
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackObjectPoolFactory.java
(original)
+++
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/StackObjectPoolFactory.java
Tue Oct 19 19:24:04 2010
@@ -31,7 +31,8 @@ import org.apache.commons.pool2.Poolable
* @version $Revision$ $Date$
* @since Pool 1.0
*/
-public class StackObjectPoolFactory<T> implements ObjectPoolFactory<T> {/**
+public class StackObjectPoolFactory<T> implements ObjectPoolFactory<T> {
+ /**
* Create a new StackObjectPoolFactory.
*
* @param factory the PoolableObjectFactory used by created pools.
@@ -78,12 +79,12 @@ public class StackObjectPoolFactory<T> i
* The PoolableObjectFactory used by created pools.
*/
private final PoolableObjectFactory<T> _factory;
-
+
/**
* The maximum number of idle instances in created pools.
*/
private int _maxSleeping = StackObjectPool.DEFAULT_MAX_SLEEPING;
-
+
/**
* The initial size of created pools.
*/
