[commons-dbcp] branch master updated: DBCP-576 - Simplify and inline variables (#99)

[ggregory]

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-dbcp.git


The following commit(s) were added to refs/heads/master by this push:
     new dcab6e0  DBCP-576 - Simplify and inline variables (#99)
dcab6e0 is described below

commit dcab6e05ac32fc4dba70ebf4d512793cc43131ce
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Mon May 31 21:49:09 2021 +0200

    DBCP-576 - Simplify and inline variables (#99)
---
 src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java        | 2 +-
 src/test/java/org/apache/commons/dbcp2/TestJndi.java                 | 3 +--
 .../org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java    | 5 ++---
 .../org/apache/commons/dbcp2/managed/TesterBasicXAConnection.java    | 3 +--
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java 
b/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
index d3dbc95..3768ea9 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingDataSource.java
@@ -252,7 +252,7 @@ public class PoolingDataSource<C extends Connection> 
implements DataSource, Auto
 
         @Override
         public boolean isClosed() throws SQLException {
-            return getDelegateInternal() == null ? true : super.isClosed();
+            return getDelegateInternal() == null || super.isClosed();
         }
     }
 }
diff --git a/src/test/java/org/apache/commons/dbcp2/TestJndi.java 
b/src/test/java/org/apache/commons/dbcp2/TestJndi.java
index 7c5aa5d..c263bd2 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestJndi.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestJndi.java
@@ -142,7 +142,6 @@ public class TestJndi {
         final Hashtable<String, String> environment = new Hashtable<>();
         environment.put(Context.INITIAL_CONTEXT_FACTORY,
                 org.apache.naming.java.javaURLContextFactory.class.getName());
-        final InitialContext ctx = new InitialContext(environment);
-        return ctx;
+        return new InitialContext(environment);
     }
 }
diff --git 
a/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java 
b/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
index feb9f15..ad35e39 100644
--- 
a/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
+++ 
b/src/test/java/org/apache/commons/dbcp2/TestPStmtPoolingBasicDataSource.java
@@ -183,12 +183,11 @@ public class TestPStmtPoolingBasicDataSource extends 
TestBasicDataSource {
 
         stmt1.close();
 
-        final Connection conn2 = conn1;
-        assertNotNull(conn2);
+        assertNotNull(conn1);
         assertEquals(1, ds.getNumActive());
         assertEquals(0, ds.getNumIdle());
 
-        final PreparedStatement stmt2 = conn2.prepareStatement("select 'a' 
from dual");
+        final PreparedStatement stmt2 = conn1.prepareStatement("select 'a' 
from dual");
         assertNotNull(stmt2);
 
         final Statement inner2 = ((DelegatingPreparedStatement) 
stmt2).getInnermostDelegate();
diff --git 
a/src/test/java/org/apache/commons/dbcp2/managed/TesterBasicXAConnection.java 
b/src/test/java/org/apache/commons/dbcp2/managed/TesterBasicXAConnection.java
index d9b48a1..ceeaadb 100644
--- 
a/src/test/java/org/apache/commons/dbcp2/managed/TesterBasicXAConnection.java
+++ 
b/src/test/java/org/apache/commons/dbcp2/managed/TesterBasicXAConnection.java
@@ -77,10 +77,9 @@ public class TesterBasicXAConnection implements XAConnection 
{
             throw e;
         }
         handle = new ConnectionHandle(conn, this);
-        final Connection proxy = (Connection) Proxy.newProxyInstance(
+        return (Connection) Proxy.newProxyInstance(
                 getClass().getClassLoader(), new Class[] { Connection.class },
                 handle);
-        return proxy;
     }
 
     protected void closeHandle() throws SQLException {