You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by gg...@apache.org on 2018/06/11 15:54:42 UTC
commons-dbcp git commit: Use ternary expressions.
Repository: commons-dbcp
Updated Branches:
refs/heads/master 2ce7b2c3d -> 0d4bfa919
Use ternary expressions.
Project: http://git-wip-us.apache.org/repos/asf/commons-dbcp/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-dbcp/commit/0d4bfa91
Tree: http://git-wip-us.apache.org/repos/asf/commons-dbcp/tree/0d4bfa91
Diff: http://git-wip-us.apache.org/repos/asf/commons-dbcp/diff/0d4bfa91
Branch: refs/heads/master
Commit: 0d4bfa919943d2053868ac7a48c2757502c5cdec
Parents: 2ce7b2c
Author: Gary Gregory <ga...@gmail.com>
Authored: Mon Jun 11 09:54:38 2018 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Mon Jun 11 09:54:38 2018 -0600
----------------------------------------------------------------------
.../org/apache/commons/dbcp2/PoolingDataSource.java | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-dbcp/blob/0d4bfa91/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java b/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
index 99e89d5..428c109 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
@@ -227,10 +227,7 @@ public class PoolingDataSource<C extends Connection> implements DataSource, Auto
*/
@Override
public D getDelegate() {
- if (isAccessToUnderlyingConnectionAllowed()) {
- return super.getDelegate();
- }
- return null;
+ return isAccessToUnderlyingConnectionAllowed() ? super.getDelegate() : null;
}
/**
@@ -238,10 +235,7 @@ public class PoolingDataSource<C extends Connection> implements DataSource, Auto
*/
@Override
public Connection getInnermostDelegate() {
- if (isAccessToUnderlyingConnectionAllowed()) {
- return super.getInnermostDelegate();
- }
- return null;
+ return isAccessToUnderlyingConnectionAllowed() ? super.getInnermostDelegate() : null;
}
@Override
@@ -254,10 +248,7 @@ public class PoolingDataSource<C extends Connection> implements DataSource, Auto
@Override
public boolean isClosed() throws SQLException {
- if (getDelegateInternal() == null) {
- return true;
- }
- return super.isClosed();
+ return getDelegateInternal() == null ? true : super.isClosed();
}
}
}