(commons-dbcp) 13/15: Merge if statements

[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

commit c22016e982b31886855f249a8d9825a11b87c21d
Author: Gary Gregory <garydgreg...@gmail.com>
AuthorDate: Fri Nov 21 19:57:02 2025 +0000

    Merge if statements
---
 src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java 
b/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java
index 8f948312..93f066de 100644
--- a/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java
+++ b/src/main/java/org/apache/commons/dbcp2/datasources/UserPassKey.java
@@ -78,10 +78,7 @@ final class UserPassKey implements Serializable {
         if (this == obj) {
             return true;
         }
-        if (obj == null) {
-            return false;
-        }
-        if (getClass() != obj.getClass()) {
+        if (obj == null || getClass() != obj.getClass()) {
             return false;
         }
         final UserPassKey other = (UserPassKey) obj;