This is an automated email from the ASF dual-hosted git repository. ggregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-pool.git
commit 6af7b0d815ca203990fff0e8064effbce915afde Author: Gary Gregory <gardgreg...@gmail.com> AuthorDate: Fri Nov 20 21:46:29 2020 -0500 No need to initialize to default value. --- .../java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java | 4 +--- .../java/org/apache/commons/pool2/impl/TestGenericObjectPool.java | 5 ++--- 2 files changed, 3 insertions(+), 6 deletions(-) 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 8429589..5dc1a26 100644 --- a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java @@ -1355,11 +1355,9 @@ public class GenericKeyedObjectPool<K, T> extends BaseGenericObjectPool<T> final int maxTotal = getMaxTotal(); final int maxTotalPerKeySave = getMaxTotalPerKey(); - int objectDefecit = 0; - // Calculate no of objects needed to be created, in order to have // the number of pooled objects < maxTotalPerKey(); - objectDefecit = getMinIdlePerKey() - objectDeque.getIdleObjects().size(); + int objectDefecit = getMinIdlePerKey() - objectDeque.getIdleObjects().size(); if (maxTotalPerKeySave > 0) { final int growLimit = Math.max(0, maxTotalPerKeySave - objectDeque.getIdleObjects().size()); diff --git a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java index 7fa8519..f9d6f91 100644 --- a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java +++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java @@ -1759,7 +1759,6 @@ public class TestGenericObjectPool extends TestBaseObjectPool { @Test(timeout = 60000) public void testFIFO() throws Exception { - String o = null; genericObjectPool.setLifo(false); genericObjectPool.addObject(); // "0" genericObjectPool.addObject(); // "1" @@ -1767,7 +1766,7 @@ public class TestGenericObjectPool extends TestBaseObjectPool { assertEquals("Oldest", "0", genericObjectPool.borrowObject()); assertEquals("Middle", "1", genericObjectPool.borrowObject()); assertEquals("Youngest", "2", genericObjectPool.borrowObject()); - o = genericObjectPool.borrowObject(); + String o = genericObjectPool.borrowObject(); assertEquals("new-3", "3", o); genericObjectPool.returnObject(o); assertEquals("returned-3", o, genericObjectPool.borrowObject()); @@ -1879,7 +1878,7 @@ public class TestGenericObjectPool extends TestBaseObjectPool { @Test(timeout = 60000) public void testLIFO() throws Exception { - String o = null; + String o; genericObjectPool.setLifo(true); genericObjectPool.addObject(); // "0" genericObjectPool.addObject(); // "1"