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 2020/11/20 22:25:22 UTC
[commons-dbcp] branch master updated: Remove useless null-check.
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 7efda36 Remove useless null-check.
7efda36 is described below
commit 7efda36eb7751b525e25a914c8ded7bffdd10a68
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 20 17:25:17 2020 -0500
Remove useless null-check.
---
src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java | 2 +-
.../java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java | 2 +-
src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java | 6 +++---
src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
index 6e3c3e0..6bd266a 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingConnection.java
@@ -173,7 +173,7 @@ public class DelegatingConnection<C extends Connection> extends AbandonedTrace i
@SuppressWarnings("resource")
public final Connection getInnermostDelegateInternal() {
Connection conn = connection;
- while (conn != null && conn instanceof DelegatingConnection) {
+ while (conn instanceof DelegatingConnection) {
conn = ((DelegatingConnection<?>) conn).getDelegateInternal();
if (this == conn) {
return null;
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java b/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
index 9aea2d3..10d8ca5 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingDatabaseMetaData.java
@@ -439,7 +439,7 @@ public class DelegatingDatabaseMetaData implements DatabaseMetaData {
*/
public DatabaseMetaData getInnermostDelegate() {
DatabaseMetaData m = databaseMetaData;
- while (m != null && m instanceof DelegatingDatabaseMetaData) {
+ while (m instanceof DelegatingDatabaseMetaData) {
m = ((DelegatingDatabaseMetaData) m).getDelegate();
if (this == m) {
return null;
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
index 86e4d43..4e6e9f3 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingResultSet.java
@@ -608,7 +608,7 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS
@SuppressWarnings("resource")
public ResultSet getInnermostDelegate() {
ResultSet r = resultSet;
- while (r != null && r instanceof DelegatingResultSet) {
+ while (r instanceof DelegatingResultSet) {
r = ((DelegatingResultSet) r).getDelegate();
if (this == r) {
return null;
@@ -1047,9 +1047,9 @@ public final class DelegatingResultSet extends AbandonedTrace implements ResultS
}
protected void handleException(final SQLException e) throws SQLException {
- if (statement != null && statement instanceof DelegatingStatement) {
+ if (statement instanceof DelegatingStatement) {
((DelegatingStatement) statement).handleException(e);
- } else if (connection != null && connection instanceof DelegatingConnection) {
+ } else if (connection instanceof DelegatingConnection) {
((DelegatingConnection<?>) connection).handleException(e);
} else {
throw e;
diff --git a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
index 95253e5..257659a 100644
--- a/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/DelegatingStatement.java
@@ -467,7 +467,7 @@ public class DelegatingStatement extends AbandonedTrace implements Statement {
@SuppressWarnings("resource")
public Statement getInnermostDelegate() {
Statement s = statement;
- while (s != null && s instanceof DelegatingStatement) {
+ while (s instanceof DelegatingStatement) {
s = ((DelegatingStatement) s).getDelegate();
if (this == s) {
return null;