Follow-up to r1769582 Use the correct units. Thanks to kfujino. git-svn-id: https://svn.apache.org/repos/asf/commons/proper/pool/trunk@1769740 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-pool/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-pool/commit/505842e0 Tree: http://git-wip-us.apache.org/repos/asf/commons-pool/tree/505842e0 Diff: http://git-wip-us.apache.org/repos/asf/commons-pool/diff/505842e0 Branch: refs/heads/master Commit: 505842e08d42af70f0c957b78197b90a74c1c6af Parents: b48c9f5 Author: Mark Thomas <ma...@apache.org> Authored: Tue Nov 15 07:18:19 2016 +0000 Committer: Mark Thomas <ma...@apache.org> Committed: Tue Nov 15 07:18:19 2016 +0000 ---------------------------------------------------------------------- .../java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-pool/blob/505842e0/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 816e0d6..e9aa04e 100644 --- a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java @@ -720,7 +720,7 @@ public abstract class BaseGenericObjectPool<T> extends BaseObject { final void startEvictor(final long delay) { synchronized (evictionLock) { if (null != evictor) { - EvictionTimer.cancel(evictor, evictorShutdownTimeoutMillis, TimeUnit.SECONDS); + EvictionTimer.cancel(evictor, evictorShutdownTimeoutMillis, TimeUnit.MILLISECONDS); evictor = null; evictionIterator = null; }
