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 2023/01/21 22:38:54 UTC
[commons-dbcp] branch master updated: Internal refactoring
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 956777e4 Internal refactoring
956777e4 is described below
commit 956777e41ae554918e78473ec1fe57c8512b0d25
Author: Gary Gregory <ga...@gmail.com>
AuthorDate: Sat Jan 21 17:38:50 2023 -0500
Internal refactoring
---
src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java | 10 +++++++---
.../org/apache/commons/dbcp2/PoolableCallableStatement.java | 4 +---
.../org/apache/commons/dbcp2/PoolablePreparedStatement.java | 4 +---
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java b/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java
index 62b88457..c462bb22 100644
--- a/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java
+++ b/src/main/java/org/apache/commons/dbcp2/AbandonedTrace.java
@@ -37,6 +37,12 @@ import org.apache.commons.pool2.TrackedUse;
*/
public class AbandonedTrace implements TrackedUse, AutoCloseable {
+ static void add(AbandonedTrace receiver, AbandonedTrace trace) {
+ if (receiver != null) {
+ receiver.addTrace(trace);
+ }
+ }
+
/** A list of objects created by children of this object. */
private final List<WeakReference<AbandonedTrace>> traceList = new ArrayList<>();
@@ -152,9 +158,7 @@ public class AbandonedTrace implements TrackedUse, AutoCloseable {
* AbandonedTrace parent object.
*/
private void init(final AbandonedTrace parent) {
- if (parent != null) {
- parent.addTrace(this);
- }
+ AbandonedTrace.add(parent, this);
}
/**
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java b/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
index b156b1e1..2552efe4 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolableCallableStatement.java
@@ -76,9 +76,7 @@ public class PoolableCallableStatement extends DelegatingCallableStatement {
@Override
public void activate() throws SQLException {
setClosedInternal(false);
- if (getConnectionInternal() != null) {
- getConnectionInternal().addTrace(this);
- }
+ AbandonedTrace.add(getConnectionInternal(), this);
super.activate();
}
diff --git a/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java b/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
index 9e7b1363..fd11d7d6 100644
--- a/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
+++ b/src/main/java/org/apache/commons/dbcp2/PoolablePreparedStatement.java
@@ -74,9 +74,7 @@ public class PoolablePreparedStatement<K> extends DelegatingPreparedStatement {
@Override
public void activate() throws SQLException {
setClosedInternal(false);
- if (getConnectionInternal() != null) {
- getConnectionInternal().addTrace(this);
- }
+ AbandonedTrace.add(getConnectionInternal(), this);
super.activate();
}