You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/08/17 15:32:18 UTC
[07/19] commons-pool git commit: [POOL-346] Move common configuration
setter to BaseGenericObjectPool. Applied slightly modifier patch. Closes #9.
[POOL-346] Move common configuration setter to BaseGenericObjectPool.
Applied slightly modifier patch. Closes #9.
Project: http://git-wip-us.apache.org/repos/asf/commons-pool/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-pool/commit/3e6dfcd6
Tree: http://git-wip-us.apache.org/repos/asf/commons-pool/tree/3e6dfcd6
Diff: http://git-wip-us.apache.org/repos/asf/commons-pool/diff/3e6dfcd6
Branch: refs/heads/release
Commit: 3e6dfcd61ddcd88b18934738ebda05c84c948a80
Parents: 1faadd2
Author: Michael Chen <mi...@rivetlogic.com>
Authored: Sun Jul 15 23:01:34 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Sun Jul 15 23:01:34 2018 -0600
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
.../pool2/impl/BaseGenericObjectPool.java | 23 ++++++++++++++++++++
.../pool2/impl/GenericKeyedObjectPool.java | 21 +-----------------
.../commons/pool2/impl/GenericObjectPool.java | 21 +-----------------
4 files changed, 28 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-pool/blob/3e6dfcd6/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 3f29ad9..fb3d301 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -47,6 +47,9 @@ The <action> type attribute can be add,update,fix,remove.
<action dev="ggregory" issue="POOL-345" type="update">
Update optional library cglib from 3.2.6 to 3.2.7.
</action>
+ <action dev="ggregory" issue="POOL-346" type="update" due-to="Michael Chen">
+ Move common configuration setter to BaseGenericObjectPool #9.
+ </action>
</release>
<release version="2.6.0" date="2018-07-06" description="This is a maintenance release.">
<action dev="ggregory" issue="POOL-336" type="update" due-to="Wolfgang Glas">
http://git-wip-us.apache.org/repos/asf/commons-pool/blob/3e6dfcd6/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
index ebd2920..f06a44b 100644
--- a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java
@@ -217,6 +217,29 @@ public abstract class BaseGenericObjectPool<T> extends BaseObject {
this.blockWhenExhausted = blockWhenExhausted;
}
+ protected void setConfig(BaseObjectPoolConfig<T> conf) {
+ setLifo(conf.getLifo());
+ setMaxWaitMillis(conf.getMaxWaitMillis());
+ setBlockWhenExhausted(conf.getBlockWhenExhausted());
+ setTestOnCreate(conf.getTestOnCreate());
+ setTestOnBorrow(conf.getTestOnBorrow());
+ setTestOnReturn(conf.getTestOnReturn());
+ setTestWhileIdle(conf.getTestWhileIdle());
+ setNumTestsPerEvictionRun(conf.getNumTestsPerEvictionRun());
+ setMinEvictableIdleTimeMillis(conf.getMinEvictableIdleTimeMillis());
+ setTimeBetweenEvictionRunsMillis(conf.getTimeBetweenEvictionRunsMillis());
+ setSoftMinEvictableIdleTimeMillis(conf.getSoftMinEvictableIdleTimeMillis());
+ final EvictionPolicy<T> policy = conf.getEvictionPolicy();
+ if (policy == null) {
+ // Use the class name (pre-2.6.0 compatible)
+ setEvictionPolicyClassName(conf.getEvictionPolicyClassName());
+ } else {
+ // Otherwise, use the class (2.6.0 feature)
+ setEvictionPolicy(policy);
+ }
+ setEvictorShutdownTimeoutMillis(conf.getEvictorShutdownTimeoutMillis());
+ }
+
/**
* Returns the maximum amount of time (in milliseconds) the
* <code>borrowObject()</code> method should block before throwing an
http://git-wip-us.apache.org/repos/asf/commons-pool/blob/3e6dfcd6/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
index 584298a..3dab36e 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java
@@ -237,30 +237,11 @@ public class GenericKeyedObjectPool<K, T> extends BaseGenericObjectPool<T>
* @see GenericKeyedObjectPoolConfig
*/
public void setConfig(final GenericKeyedObjectPoolConfig<T> conf) {
- setLifo(conf.getLifo());
+ super.setConfig(conf);
setMaxIdlePerKey(conf.getMaxIdlePerKey());
setMaxTotalPerKey(conf.getMaxTotalPerKey());
setMaxTotal(conf.getMaxTotal());
setMinIdlePerKey(conf.getMinIdlePerKey());
- setMaxWaitMillis(conf.getMaxWaitMillis());
- setBlockWhenExhausted(conf.getBlockWhenExhausted());
- setTestOnCreate(conf.getTestOnCreate());
- setTestOnBorrow(conf.getTestOnBorrow());
- setTestOnReturn(conf.getTestOnReturn());
- setTestWhileIdle(conf.getTestWhileIdle());
- setNumTestsPerEvictionRun(conf.getNumTestsPerEvictionRun());
- setMinEvictableIdleTimeMillis(conf.getMinEvictableIdleTimeMillis());
- setSoftMinEvictableIdleTimeMillis(conf.getSoftMinEvictableIdleTimeMillis());
- setTimeBetweenEvictionRunsMillis(conf.getTimeBetweenEvictionRunsMillis());
- final EvictionPolicy<T> policy = conf.getEvictionPolicy();
- if (policy == null) {
- // Use the class name (pre-2.6.0 compatible)
- setEvictionPolicyClassName(conf.getEvictionPolicyClassName());
- } else {
- // Otherwise, use the class (2.6.0 feature)
- setEvictionPolicy(policy);
- }
- setEvictorShutdownTimeoutMillis(conf.getEvictorShutdownTimeoutMillis());
}
/**
http://git-wip-us.apache.org/repos/asf/commons-pool/blob/3e6dfcd6/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
index 6c3589e..7ad8a5a 100644
--- a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
+++ b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java
@@ -297,29 +297,10 @@ public class GenericObjectPool<T> extends BaseGenericObjectPool<T>
* @see GenericObjectPoolConfig
*/
public void setConfig(final GenericObjectPoolConfig<T> conf) {
- setLifo(conf.getLifo());
+ super.setConfig(conf);
setMaxIdle(conf.getMaxIdle());
setMinIdle(conf.getMinIdle());
setMaxTotal(conf.getMaxTotal());
- setMaxWaitMillis(conf.getMaxWaitMillis());
- setBlockWhenExhausted(conf.getBlockWhenExhausted());
- setTestOnCreate(conf.getTestOnCreate());
- setTestOnBorrow(conf.getTestOnBorrow());
- setTestOnReturn(conf.getTestOnReturn());
- setTestWhileIdle(conf.getTestWhileIdle());
- setNumTestsPerEvictionRun(conf.getNumTestsPerEvictionRun());
- setMinEvictableIdleTimeMillis(conf.getMinEvictableIdleTimeMillis());
- setTimeBetweenEvictionRunsMillis(conf.getTimeBetweenEvictionRunsMillis());
- setSoftMinEvictableIdleTimeMillis(conf.getSoftMinEvictableIdleTimeMillis());
- final EvictionPolicy<T> policy = conf.getEvictionPolicy();
- if (policy == null) {
- // Use the class name (pre-2.6.0 compatible)
- setEvictionPolicyClassName(conf.getEvictionPolicyClassName());
- } else {
- // Otherwise, use the class (2.6.0 feature)
- setEvictionPolicy(policy);
- }
- setEvictorShutdownTimeoutMillis(conf.getEvictorShutdownTimeoutMillis());
}
/**