Repository: commons-pool Updated Branches: refs/heads/master c2dd4c3ea -> 9d92f15b4
Refactor call to startEvictor(1L) (magic number) into a new method stopEvictor(). This makes the intent of the call obvious. Project: http://git-wip-us.apache.org/repos/asf/commons-pool/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-pool/commit/9d92f15b Tree: http://git-wip-us.apache.org/repos/asf/commons-pool/tree/9d92f15b Diff: http://git-wip-us.apache.org/repos/asf/commons-pool/diff/9d92f15b Branch: refs/heads/master Commit: 9d92f15b4384333a6ac826ff83453e0aa0faf405 Parents: c2dd4c3 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Thu Aug 16 18:13:18 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Thu Aug 16 18:13:18 2018 -0600 ---------------------------------------------------------------------- .../org/apache/commons/pool2/impl/BaseGenericObjectPool.java | 6 ++++++ .../org/apache/commons/pool2/impl/GenericKeyedObjectPool.java | 2 +- .../java/org/apache/commons/pool2/impl/GenericObjectPool.java | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-pool/blob/9d92f15b/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 f06a44b..2cfbefd 100644 --- a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java @@ -785,6 +785,12 @@ public abstract class BaseGenericObjectPool<T> extends BaseObject { } /** + * Stops the evictor. + */ + void stopEvitor() { + startEvictor(-1L); + } + /** * Tries to ensure that the configured minimum number of idle instances are * available in the pool. * @throws Exception if an error occurs creating idle instances http://git-wip-us.apache.org/repos/asf/commons-pool/blob/9d92f15b/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 3dab36e..72aab16 100644 --- a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java @@ -688,7 +688,7 @@ public class GenericKeyedObjectPool<K, T> extends BaseGenericObjectPool<T> // Stop the evictor before the pool is closed since evict() calls // assertOpen() - startEvictor(-1L); + stopEvitor(); closed = true; // This clear removes any idle objects http://git-wip-us.apache.org/repos/asf/commons-pool/blob/9d92f15b/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 a05038a..0f4b357 100644 --- a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java @@ -672,7 +672,7 @@ public class GenericObjectPool<T> extends BaseGenericObjectPool<T> // Stop the evictor before the pool is closed since evict() calls // assertOpen() - startEvictor(-1L); + stopEvitor(); closed = true; // This clear removes any idle objects
