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 2024/11/23 04:00:37 UTC
(commons-dbcp) 07/09: Fix possible NullPointerException in PoolingConnection.close()
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 0b9a0054df253c9983d686f624956f6797e1bb0c
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Fri Nov 22 18:49:02 2024 -0500
Fix possible NullPointerException in PoolingConnection.close()
---
src/changes/changes.xml | 3 ++-
src/main/java/org/apache/commons/dbcp2/PoolingConnection.java | 6 +++++-
src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java | 1 +
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 7862775b..7e87d3d6 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -66,7 +66,8 @@ The <action> type attribute can be add,update,fix,remove.
<!-- FIX -->
<action type="fix" dev="ggregory" due-to="Johno Crawford">Avoid object creation when invoking isDisconnectionSqlException #422.</action>
<action type="fix" issue="DBCP-599" dev="ggregory" due-to="denixx baykin, Phil Steitz, Gary Gregory">PoolableConnectionFactory.destroyObject() method behaves incorrectly on ABANDONED connection, issue with unhandled AbstractMethodError. DelegatingConnection.abort(Executor) should delegate to Jdbc41Bridge</action>
- <action type="fix" dev="ggregory" due-to="Gary Gregory">DelegatingConnection.setSchema(String) should delegate to Jdbc41Bridge.</action>
+ <action type="fix" dev="ggregory" due-to="Gary Gregory">DelegatingConnection.setSchema(String) should delegate to Jdbc41Bridge.</action>
+ <action type="fix" dev="ggregory" due-to="Gary Gregory">Fix possible NullPointerException in PoolingConnection.close().</action>
<action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD UnnecessaryFullyQualifiedName in AbandonedTrace.</action>
<action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD UnnecessaryFullyQualifiedName in PoolableCallableStatement.</action>
<action type="fix" dev="ggregory" due-to="Gary Gregory">Fix PMD UnnecessaryFullyQualifiedName in PoolablePreparedStatement.</action>
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
index b4ce3eb6..a5fe2b34 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolingConnection.java
@@ -122,7 +122,11 @@ public class PoolingConnection extends DelegatingConnection<Connection>
}
} finally {
try {
- getDelegateInternal().close();
+ @SuppressWarnings("resource")
+ final Connection delegateInternal = getDelegateInternal();
+ if (delegateInternal != null) {
+ delegateInternal.close();
+ }
} finally {
setClosedInternal(true);
}
diff --git a/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java b/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
index 6bed2824..e944f9ec 100644
--- a/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
+++ b/src/test/java/org/apache/commons/dbcp2/TestPoolingConnection.java
@@ -175,6 +175,7 @@ public class TestPoolingConnection {
*/
@Test
public void testToStringStackOverflow() throws SQLException {
+ // Also tests a possible NullPointerException in PoolingConnection.close()
try (PoolingConnection conn = new PoolingConnection(null)) {
final GenericKeyedObjectPoolConfig<DelegatingPreparedStatement> config = new GenericKeyedObjectPoolConfig<>();
try (GenericKeyedObjectPool<PStmtKey, DelegatingPreparedStatement> stmtPool = new GenericKeyedObjectPool<>(conn, config)) {