(commons-dbcp) branch master updated: Flip null test

[ggregory]

This is an automated email from the ASF dual-hosted git repository.

garydgregory 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 6af9e7de Flip null test
6af9e7de is described below

commit 6af9e7de69579c75fa1b5dadda669249977d9c2d
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Sun Jul 5 09:30:36 2026 -0400

    Flip null test
---
 src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java        | 2 +-
 src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java   | 2 +-
 src/main/java/org/apache/commons/dbcp2/PoolingConnection.java           | 2 +-
 .../org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java     | 2 +-
 .../apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java 
b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
index a56c6b47..8934f7f2 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
@@ -112,7 +112,7 @@ public class DelegatingConnection<C extends Connection> 
extends AbandonedTrace i
      */
     protected void checkOpen() throws SQLException {
         if (closed) {
-            if (null != connection) {
+            if (connection != null) {
                 String label;
                 try {
                     label = connection.toString();
diff --git 
a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java 
b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
index e2e6d53b..c7b6feb5 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
@@ -779,7 +779,7 @@ public class PoolableConnectionFactory implements 
PooledObjectFactory<PoolableCo
      *            the {@link ObjectPool} in which to pool those {@link 
Connection}s
      */
     public synchronized void setPool(final ObjectPool<PoolableConnection> 
pool) {
-        if (null != this.pool && pool != this.pool) {
+        if (this.pool != null && pool != this.pool) {
             Utils.closeQuietly(this.pool);
         }
         this.pool = pool;
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java 
b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
index 6adbc36a..13964de7 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
@@ -110,7 +110,7 @@ public class PoolingConnection extends 
DelegatingConnection<Connection>
     @Override
     public synchronized void close() throws SQLException {
         try {
-            if (null != stmtPool) {
+            if (stmtPool != null) {
                 final KeyedObjectPool<PStmtKey, DelegatingPreparedStatement> 
oldPool = stmtPool;
                 stmtPool = null;
                 try {
diff --git 
a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java 
b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
index 1ae9d99b..7cbfc513 100644
--- 
a/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
+++ 
b/src/main/java/org/apache/commons/dbcp2/datasources/CPDSConnectionFactory.java
@@ -130,7 +130,7 @@ final class CPDSConnectionFactory extends 
AbstractConnectionFactory
     @Override
     public void connectionErrorOccurred(final ConnectionEvent event) {
         final PooledConnection pc = (PooledConnection) event.getSource();
-        if (null != event.getSQLException()) {
+        if (event.getSQLException() != null) {
             System.err.println("CLOSING DOWN CONNECTION DUE TO INTERNAL ERROR 
(" + event.getSQLException() + ")");
         }
         pc.removeConnectionEventListener(this);
diff --git 
a/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
 
b/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
index 40b76fe2..ca399624 100644
--- 
a/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
+++ 
b/src/main/java/org/apache/commons/dbcp2/datasources/KeyedCPDSConnectionFactory.java
@@ -117,7 +117,7 @@ final class KeyedCPDSConnectionFactory extends 
AbstractConnectionFactory
     @Override
     public void connectionErrorOccurred(final ConnectionEvent event) {
         final PooledConnection pc = (PooledConnection) event.getSource();
-        if (null != event.getSQLException()) {
+        if (event.getSQLException() != null) {
             System.err.println("CLOSING DOWN CONNECTION DUE TO INTERNAL ERROR 
(" + event.getSQLException() + ")");
         }
         pc.removeConnectionEventListener(this);