[optimize] borrow didn't pick closing node.

PhantomThief · Dec 26, 2017 · a87f995 · a87f995
1 parent e3481ec
commit a87f995
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/com/github/phantomthief/pool/impl/ConcurrencyAwarePool.java b/src/main/java/com/github/phantomthief/pool/impl/ConcurrencyAwarePool.java
@@ -165,6 +165,7 @@ public Pooled<T> borrow() {
             throw new IllegalStateException("pool is closed.");
         }
         CounterWrapper counterWrapper = currentAvailable.stream() //
+                .filter(it -> !it.isClosing()) //
                 .min(comparingInt(CounterWrapper::currentConcurrency)) //
                 .orElseThrow(() -> new IllegalStateException("pool is closed."));
         counterWrapper.enter();
@@ -256,13 +257,17 @@ public void close() throws Exception {
             }
         }
 
+        private boolean isClosing() {
+            return closing;
+        }
+
         @Override
         public int currentConcurrency() {
             return concurrency.intValue();
         }
 
         private void enter() {
-            concurrency.incrementAndGet();
+            concurrency.getAndIncrement();
         }
 
         private void leave() {
@@ -282,7 +287,7 @@ private static class SimpleStatsKey<V> implements StatsKey<V> {
         SimpleStatsKey(Class<V> type) {
             this.type = type;
         }
-        
+
         V cast(Object obj) {
             return type.cast(obj);
         }