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

[markt]

Author: markt
Date: Fri Jun  3 10:59:10 2011
New Revision: 1130982

URL: http://svn.apache.org/viewvc?rev=1130982&view=rev
Log:
Refactor

Modified:
    
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.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/BaseObjectPoolConfig.java
URL: 
http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java?rev=1130982&r1=1130981&r2=1130982&view=diff
==============================================================================
--- 
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
 (original)
+++ 
commons/proper/pool/trunk/src/java/org/apache/commons/pool2/impl/BaseObjectPoolConfig.java
 Fri Jun  3 10:59:10 2011
@@ -68,11 +68,6 @@ public abstract class BaseObjectPoolConf
     public static final int DEFAULT_NUM_TESTS_PER_EVICTION_RUN = 3;
 
     /**
-     * The default value for {@link #getSoftMinEvictableIdleTimeMillis}.
-     */
-    public static final long DEFAULT_SOFT_MIN_EVICTABLE_IDLE_TIME_MILLIS = -1;
-
-    /**
      * The default "test on borrow" value.
      */
     public static final boolean DEFAULT_TEST_ON_BORROW = false;
@@ -115,9 +110,6 @@ public abstract class BaseObjectPoolConf
     private int numTestsPerEvictionRun =
         DEFAULT_NUM_TESTS_PER_EVICTION_RUN;
 
-    private long softMinEvictableIdleTimeMillis =
-        DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS;
-
     private boolean testOnBorrow = DEFAULT_TEST_ON_BORROW;
 
     private boolean testOnReturn = DEFAULT_TEST_ON_RETURN;
@@ -187,15 +179,6 @@ public abstract class BaseObjectPoolConf
         this.numTestsPerEvictionRun = numTestsPerEvictionRun;
     }
 
-    public long getSoftMinEvictableIdleTimeMillis() {
-        return softMinEvictableIdleTimeMillis;
-    }
-
-    public void setSoftMinEvictableIdleTimeMillis(
-            long softMinEvictableIdleTimeMillis) {
-        this.softMinEvictableIdleTimeMillis = softMinEvictableIdleTimeMillis;
-    }
-
     public boolean getTestOnBorrow() {
         return testOnBorrow;
     }

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=1130982&r1=1130981&r2=1130982&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:59:10 2011
@@ -26,8 +26,17 @@ import org.apache.commons.pool2.Poolable
  */
 public class GenericObjectPoolConfig extends BaseObjectPoolConfig {
 
+    /**
+     * The default value for {@link #getSoftMinEvictableIdleTimeMillis}.
+     */
+    public static final long DEFAULT_SOFT_MIN_EVICTABLE_IDLE_TIME_MILLIS = -1;
+
+    
     private PoolableObjectFactory<?> factory = null;
 
+    private long softMinEvictableIdleTimeMillis =
+        DEFAULT_MIN_EVICTABLE_IDLE_TIME_MILLIS;
+
 
     public PoolableObjectFactory<?> getFactory() {
         return factory;
@@ -36,4 +45,13 @@ public class GenericObjectPoolConfig ext
     public void setFactory(PoolableObjectFactory<?> factory) {
         this.factory = factory;
     }
+    
+    public long getSoftMinEvictableIdleTimeMillis() {
+        return softMinEvictableIdleTimeMillis;
+    }
+
+    public void setSoftMinEvictableIdleTimeMillis(
+            long softMinEvictableIdleTimeMillis) {
+        this.softMinEvictableIdleTimeMillis = softMinEvictableIdleTimeMillis;
+    }
 }