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 2025/11/21 20:30:30 UTC
(commons-dbcp) 06/15: Merge if statements
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 2c48a527787b8b994971508dad03ff7c38c5eac1
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 21 19:55:23 2025 +0000
Merge if statements
---
src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
index 07406d3c..c7d5fc4b 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
@@ -1122,10 +1122,7 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS
@Override
public boolean isWrapperFor(final Class<?> iface) throws SQLException {
- if (iface.isAssignableFrom(getClass())) {
- return true;
- }
- if (iface.isAssignableFrom(resultSet.getClass())) {
+ if (iface.isAssignableFrom(getClass()) || iface.isAssignableFrom(resultSet.getClass())) {
return true;
}
return resultSet.isWrapperFor(iface);