You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2010/10/28 16:47:15 UTC
svn commit: r1028334 - in
/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl:
GenericKeyedObjectPool.java GenericKeyedObjectPoolFactory.java
GenericObjectPool.java GenericObjectPoolFactory.java
Author: sebb
Date: Thu Oct 28 14:47:15 2010
New Revision: 1028334
URL: http://svn.apache.org/viewvc?rev=1028334&view=rev
Log:
Javadoc; generic warning fix
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/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
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=1028334&r1=1028333&r2=1028334&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 Thu Oct 28 14:47:15 2010
@@ -586,7 +586,7 @@ public class GenericKeyedObjectPool<K,V>
/**
* Sets the configuration.
* @param conf the new configuration to use.
- * @see GenericKeyedObjectPool.Config
+ * @see GenericKeyedObjectPoolConfig
*/
public synchronized void setConfig(GenericKeyedObjectPoolConfig conf) {
this.config = conf;
@@ -1541,13 +1541,14 @@ public class GenericKeyedObjectPool<K,V>
* @see #setMinIdle
* @throws Exception If there was an error whilst creating the pooled objects.
*/
+ @SuppressWarnings("unchecked") // OK, see (1)
private void ensureMinIdle() throws Exception {
//Check if should sustain the pool
if (this.config.getMinIdle() > 0) {
K[] keysCopy;
synchronized(this) {
// Get the current set of keys
- keysCopy = (K[]) _poolMap.keySet().toArray();
+ keysCopy = (K[]) _poolMap.keySet().toArray(); // (1) keySet() is of type Set<T>
}
// Loop through all elements in _poolList
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=1028334&r1=1028333&r2=1028334&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 Thu Oct 28 14:47:15 2010
@@ -48,7 +48,7 @@ public class GenericKeyedObjectPoolFacto
*
* @param factory the KeyedPoolableObjectFactory to used by created pools.
* @param config a non-null GenericKeyedObjectPool.Config describing the configuration.
- * @see GenericKeyedObjectPool#GenericKeyedObjectPool(KeyedPoolableObjectFactory, GenericKeyedObjectPool.Config)
+ * @see GenericKeyedObjectPool#GenericKeyedObjectPool(KeyedPoolableObjectFactory, GenericKeyedObjectPoolConfig)
* @throws NullPointerException when config is <code>null</code>.
*/
public GenericKeyedObjectPoolFactory(KeyedPoolableObjectFactory<K,V> factory, GenericKeyedObjectPoolConfig config) throws NullPointerException {
@@ -65,7 +65,7 @@ public class GenericKeyedObjectPoolFacto
/**
* Create a new GenericKeyedObjectPool with the currently configured properties.
*
- * @return GenericKeyedObjectPool with {@link GenericKeyedObjectPool.Config Configuration} determined by
+ * @return GenericKeyedObjectPool with {@link GenericKeyedObjectPoolConfig Configuration} determined by
* current property settings
*/
public KeyedObjectPool<K,V> createPool() {
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=1028334&r1=1028333&r2=1028334&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 Thu Oct 28 14:47:15 2010
@@ -603,7 +603,7 @@ public class GenericObjectPool<T> extend
* Sets my configuration.
*
* @param conf configuration to use.
- * @see GenericObjectPool.Config
+ * @see GenericObjectPoolConfig
*/
public synchronized void setConfig(GenericObjectPoolConfig conf) {
this.config = conf;
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=1028334&r1=1028333&r2=1028334&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 Thu Oct 28 14:47:15 2010
@@ -48,7 +48,7 @@ public class GenericObjectPoolFactory<T>
* @param factory the PoolableObjectFactory used by created pools.
* @param config a non-<code>null</code> GenericObjectPoolConfig describing the configuration.
* @throws IllegalArgumentException when factory or config is <code>null</code>.
- * @see GenericObjectPoolConfig#GenericObjectPool(PoolableObjectFactory, GenericObjectPool.Config)
+ * @see GenericObjectPoolConfig#GenericObjectPool(PoolableObjectFactory, GenericObjectPoolConfig)
*/
public GenericObjectPoolFactory(PoolableObjectFactory<T> factory, GenericObjectPoolConfig config) throws NullPointerException {
if (factory == null) {