Repository: commons-pool Updated Branches: refs/heads/master 9d92f15b4 -> 5b2832931
Use final. Project: http://git-wip-us.apache.org/repos/asf/commons-pool/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-pool/commit/5b283293 Tree: http://git-wip-us.apache.org/repos/asf/commons-pool/tree/5b283293 Diff: http://git-wip-us.apache.org/repos/asf/commons-pool/diff/5b283293 Branch: refs/heads/master Commit: 5b2832931a49e17dc227943b09ab94aeea6decd0 Parents: 9d92f15 Author: Gary Gregory <garydgreg...@gmail.com> Authored: Thu Aug 16 18:13:50 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Thu Aug 16 18:13:50 2018 -0600 ---------------------------------------------------------------------- .../org/apache/commons/pool2/impl/BaseGenericObjectPool.java | 2 +- .../java/org/apache/commons/pool2/impl/GenericObjectPool.java | 4 ++-- .../org/apache/commons/pool2/impl/TestGenericObjectPool.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-pool/blob/5b283293/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java index 2cfbefd..8efb01f 100644 --- a/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/impl/BaseGenericObjectPool.java @@ -217,7 +217,7 @@ public abstract class BaseGenericObjectPool<T> extends BaseObject { this.blockWhenExhausted = blockWhenExhausted; } - protected void setConfig(BaseObjectPoolConfig<T> conf) { + protected void setConfig(final BaseObjectPoolConfig<T> conf) { setLifo(conf.getLifo()); setMaxWaitMillis(conf.getMaxWaitMillis()); setBlockWhenExhausted(conf.getBlockWhenExhausted()); http://git-wip-us.apache.org/repos/asf/commons-pool/blob/5b283293/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 0f4b357..abdf7e1 100644 --- a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java @@ -822,8 +822,8 @@ public class GenericObjectPool<T> extends BaseGenericObjectPool<T> localMaxTotal = Integer.MAX_VALUE; } - long localStartTimeMillis = System.currentTimeMillis(); - long localMaxWaitTimeMillis = Math.max(getMaxWaitMillis(), 0); + final long localStartTimeMillis = System.currentTimeMillis(); + final long localMaxWaitTimeMillis = Math.max(getMaxWaitMillis(), 0); // Flag that indicates if create should: // - TRUE: call the factory to create an object http://git-wip-us.apache.org/repos/asf/commons-pool/blob/5b283293/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java ---------------------------------------------------------------------- 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 b84924d..a6ee7ff 100644 --- a/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java +++ b/src/test/java/org/apache/commons/pool2/impl/TestGenericObjectPool.java @@ -2639,7 +2639,7 @@ public class TestGenericObjectPool extends TestBaseObjectPool { @Test(timeout = 1200 /* maxWaitMillis x2 + padding */) public void testReturnBorrowObjectWithingMaxWaitMillis() throws Exception { - long maxWaitMillis = 500; + final long maxWaitMillis = 500; final GenericObjectPool<String> createSlowObjectFactoryPool = new GenericObjectPool<>(createSlowObjectFactory(60000)); @@ -2657,7 +2657,7 @@ public class TestGenericObjectPool extends TestBaseObjectPool { try { createSlowObjectFactoryPool.borrowObject(maxWaitMillis); fail("borrowObject must fail due to timeout by maxWaitMillis"); - } catch (NoSuchElementException e) { + } catch (final NoSuchElementException e) { } Assert.assertTrue(thread1.isAlive());
