svn commit: r1130973 - in /commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl: GenericKeyedObjectPoolConfig.java GenericObjectPoolConfig.java

[markt]

Author: markt
Date: Fri Jun  3 10:08:16 2011
New Revision: 1130973

URL: http://svn.apache.org/viewvc?rev=1130973&view=rev
Log:
Use the right factories

Modified:
    
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.java
    
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPoolConfig.java

Modified: 
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.java
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.java?rev=1130973&r1=1130972&r2=1130973&view=diff
==============================================================================
--- 
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.java
 (original)
+++ 
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericKeyedObjectPoolConfig.java
 Fri Jun  3 10:08:16 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.pool2.impl;
 
-import org.apache.commons.pool2.KeyedObjectPoolFactory;
+import org.apache.commons.pool2.KeyedPoolableObjectFactory;
 
 /**
  * A simple "struct" encapsulating the configuration for a
@@ -33,7 +33,7 @@ public class GenericKeyedObjectPoolConfi
     
     private int maxTotalPerKey = DEFAULT_MAX_TOTAL_PER_KEY;
     
-    private KeyedObjectPoolFactory<?,?> factory = null;
+    private KeyedPoolableObjectFactory<?,?> factory = null;
 
     
     public GenericKeyedObjectPoolConfig() {
@@ -42,11 +42,11 @@ public class GenericKeyedObjectPoolConfi
     }
 
 
-    public KeyedObjectPoolFactory<?,?> getFactory() {
+    public KeyedPoolableObjectFactory<?,?> getFactory() {
         return factory;
     }
 
-    public void setFactory(KeyedObjectPoolFactory<?,?> factory) {
+    public void setFactory(KeyedPoolableObjectFactory<?,?> factory) {
         this.factory = factory;
     }
 

Modified: 
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPoolConfig.java
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPoolConfig.java?rev=1130973&r1=1130972&r2=1130973&view=diff
==============================================================================
--- 
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPoolConfig.java
 (original)
+++ 
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/GenericObjectPoolConfig.java
 Fri Jun  3 10:08:16 2011
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.pool2.impl;
 
-import org.apache.commons.pool2.ObjectPoolFactory;
+import org.apache.commons.pool2.PoolableObjectFactory;
 
 /**
  * A simple "struct" encapsulating the configuration for a
@@ -26,14 +26,14 @@ import org.apache.commons.pool2.ObjectPo
  */
 public class GenericObjectPoolConfig extends BaseObjectPoolConfig {
 
-    private ObjectPoolFactory<?> factory = null;
+    private PoolableObjectFactory<?> factory = null;
 
 
-    public ObjectPoolFactory<?> getFactory() {
+    public PoolableObjectFactory<?> getFactory() {
         return factory;
     }
 
-    public void setFactory(ObjectPoolFactory<?> factory) {
+    public void setFactory(PoolableObjectFactory<?> factory) {
         this.factory = factory;
     }
 }