Repository: commons-pool Updated Branches: refs/heads/master 005020e44 -> cbe67536f
PMD: Combined nested if statements. Project: http://git-wip-us.apache.org/repos/asf/commons-pool/repo Commit: http://git-wip-us.apache.org/repos/asf/commons-pool/commit/cbe67536 Tree: http://git-wip-us.apache.org/repos/asf/commons-pool/tree/cbe67536 Diff: http://git-wip-us.apache.org/repos/asf/commons-pool/diff/cbe67536 Branch: refs/heads/master Commit: cbe67536f8a10a1415a6c421cdf9a165f3bb6c9f Parents: 005020e Author: Gary Gregory <garydgreg...@gmail.com> Authored: Wed Jun 20 16:26:17 2018 -0600 Committer: Gary Gregory <garydgreg...@gmail.com> Committed: Wed Jun 20 16:26:17 2018 -0600 ---------------------------------------------------------------------- .../pool2/impl/GenericKeyedObjectPool.java | 16 ++++++------ .../commons/pool2/impl/GenericObjectPool.java | 26 +++++++++----------- .../commons/pool2/impl/PoolImplUtils.java | 6 ++--- 3 files changed, 21 insertions(+), 27 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/commons-pool/blob/cbe67536/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 e656bcc..affcc80 100644 --- a/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/impl/GenericKeyedObjectPool.java @@ -478,16 +478,14 @@ public class GenericKeyedObjectPool<K, T> extends BaseGenericObjectPool<T> final long activeTime = p.getActiveTimeMillis(); try { - if (getTestOnReturn()) { - if (!factory.validateObject(key, p)) { - try { - destroy(key, p, true); - } catch (final Exception e) { - swallowException(e); - } - whenWaitersAddObject(key, objectDeque.idleObjects); - return; + if (getTestOnReturn() && !factory.validateObject(key, p)) { + try { + destroy(key, p, true); + } catch (final Exception e) { + swallowException(e); } + whenWaitersAddObject(key, objectDeque.idleObjects); + return; } try { http://git-wip-us.apache.org/repos/asf/commons-pool/blob/cbe67536/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 c41b5c2..6c3589e 100644 --- a/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java +++ b/src/main/java/org/apache/commons/pool2/impl/GenericObjectPool.java @@ -540,21 +540,19 @@ public class GenericObjectPool<T> extends BaseGenericObjectPool<T> final long activeTime = p.getActiveTimeMillis(); - if (getTestOnReturn()) { - if (!factory.validateObject(p)) { - try { - destroy(p); - } catch (final Exception e) { - swallowException(e); - } - try { - ensureIdle(1, false); - } catch (final Exception e) { - swallowException(e); - } - updateStatsReturn(activeTime); - return; + if (getTestOnReturn() && !factory.validateObject(p)) { + try { + destroy(p); + } catch (final Exception e) { + swallowException(e); } + try { + ensureIdle(1, false); + } catch (final Exception e) { + swallowException(e); + } + updateStatsReturn(activeTime); + return; } try { http://git-wip-us.apache.org/repos/asf/commons-pool/blob/cbe67536/src/main/java/org/apache/commons/pool2/impl/PoolImplUtils.java ---------------------------------------------------------------------- diff --git a/src/main/java/org/apache/commons/pool2/impl/PoolImplUtils.java b/src/main/java/org/apache/commons/pool2/impl/PoolImplUtils.java index 7d7e806..f3a84bf 100644 --- a/src/main/java/org/apache/commons/pool2/impl/PoolImplUtils.java +++ b/src/main/java/org/apache/commons/pool2/impl/PoolImplUtils.java @@ -120,10 +120,8 @@ class PoolImplUtils { if (iface instanceof ParameterizedType) { final ParameterizedType pi = (ParameterizedType) iface; // Look for the generic interface - if (pi.getRawType() instanceof Class) { - if (type.isAssignableFrom((Class<?>) pi.getRawType())) { - return pi; - } + if (pi.getRawType() instanceof Class && type.isAssignableFrom((Class<?>) pi.getRawType())) { + return pi; } } }
