Correct location of decrement git-svn-id: https://svn.apache.org/repos/asf/commons/proper/pool/trunk@1735292 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/f7a0d26b Tree: http://git-wip-us.apache.org/repos/asf/commons-pool/tree/f7a0d26b Diff: http://git-wip-us.apache.org/repos/asf/commons-pool/diff/f7a0d26b Branch: refs/heads/master Commit: f7a0d26b803e48ce272a5bcc96c7ff1319b00f71 Parents: 55c10ec Author: Mark Thomas <[email protected]> Authored: Wed Mar 16 20:20:11 2016 +0000 Committer: Mark Thomas <[email protected]> Committed: Wed Mar 16 20:20:11 2016 +0000 ---------------------------------------------------------------------- .../java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-pool/blob/f7a0d26b/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 d477cfa..200c424 100644 --- a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java @@ -1030,7 +1030,6 @@ public class GenericKeyedObjectPool<K,T> extends BaseGenericObjectPool<T> if (newCreateCount > maxTotalPerKeySave) { // The key is currently at capacity or in the process of // making enough new objects to take it to capacity. - numTotal.decrementAndGet(); objectDeque.getCreateCount().decrementAndGet(); if (objectDeque.makeObjectCount == 0) { // There are no makeObject() calls in progress for this @@ -1054,6 +1053,7 @@ public class GenericKeyedObjectPool<K,T> extends BaseGenericObjectPool<T> } if (!create.booleanValue()) { + numTotal.decrementAndGet(); return null; }
