diff --git a/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java b/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java index 5273967..f223e46 100644 --- a/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java +++ b/src/main/java/org/apache/hadoop/hbase/ipc/HBaseClient.java @@ -761,11 +761,11 @@ public class HBaseClient { /** * Return the pool type specified in the configuration, if it roughly equals either - * the name of {@link PoolType#Reusable} or {@link PoolType#ThreadLocal}, otherwise + * the name of {@link PoolType#RoundRobin} or {@link PoolType#ThreadLocal}, otherwise * default to the former type. * * @param config configuration - * @return either a {@link PoolType#Reusable} or {@link PoolType#ThreadLocal} + * @return either a {@link PoolType#RoundRobin} or {@link PoolType#ThreadLocal} */ private static PoolType getPoolType(Configuration config) { return PoolType.valueOf(config.get(HConstants.HBASE_CLIENT_IPC_POOL_TYPE), diff --git a/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java b/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java index fba06b7..ebf3078 100644 --- a/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java +++ b/src/main/java/org/apache/hadoop/hbase/util/PoolMap.java @@ -396,9 +396,6 @@ public class PoolMap implements Map { if (poolSize == null) { poolSizes.put(this, poolSize = new AtomicInteger(0)); } - if (poolSize.intValue() >= maxSize) { - return null; - } poolSize.incrementAndGet(); } this.set(resource);