Partial fix for regression in fix for POOL-303. Remove interrupt calls where they can't help.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/pool/trunk@1735260 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/170a5097 Tree: http://git-wip-us.apache.org/repos/asf/commons-pool/tree/170a5097 Diff: http://git-wip-us.apache.org/repos/asf/commons-pool/diff/170a5097 Branch: refs/heads/master Commit: 170a5097d7840299a1564b82f4a47c613d94663b Parents: 9c75d18 Author: Mark Thomas <ma...@apache.org> Authored: Wed Mar 16 16:37:02 2016 +0000 Committer: Mark Thomas <ma...@apache.org> Committed: Wed Mar 16 16:37:02 2016 +0000 ---------------------------------------------------------------------- .../org/apache/commons/pool2/impl/GenericKeyedObjectPool.java | 6 ------ .../java/org/apache/commons/pool2/impl/GenericObjectPool.java | 3 --- 2 files changed, 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-pool/blob/170a5097/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 82987da..dcfe448 100644 --- a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java @@ -1009,9 +1009,6 @@ public class GenericKeyedObjectPool<K,T> extends BaseGenericObjectPool<T> if (maxTotal > -1 && newNumTotal > maxTotal) { numTotal.decrementAndGet(); if (getNumIdle() == 0) { - // POOL-303. There may be threads waiting on an object - // return that isn't going to happen. Unblock them. - objectDeque.idleObjects.interuptTakeWaiters(); return null; } clearOldest(); @@ -1026,9 +1023,6 @@ public class GenericKeyedObjectPool<K,T> extends BaseGenericObjectPool<T> if (newCreateCount > maxTotalPerKeySave) { numTotal.decrementAndGet(); objectDeque.getCreateCount().decrementAndGet(); - // POOL-303. There may be threads waiting on an object return that - // isn't going to happen. Unblock them. - objectDeque.idleObjects.interuptTakeWaiters(); return null; } http://git-wip-us.apache.org/repos/asf/commons-pool/blob/170a5097/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 2aadb43..0e0c9bd 100644 --- a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java @@ -848,9 +848,6 @@ public class GenericObjectPool<T> extends BaseGenericObjectPool<T> final long newCreateCount = createCount.incrementAndGet(); if (newCreateCount > localMaxTotal) { createCount.decrementAndGet(); - // POOL-303. There may be threads waiting on an object return that - // isn't going to happen. Unblock them. - idleObjects.interuptTakeWaiters(); return null; }
