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 758df627c761d29595d16eedf1b408f08c27d041
Author: Gary D. Gregory <garydgreg...@gmail.com>
AuthorDate: Sun May 25 15:52:10 2025 -0400
Remove extra vertical whitespace
---
.../org/apache/commons/dbcp2/managed/ManagedConnection.java | 12 ------------
1 file changed, 12 deletions(-)
diff --git
a/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java
b/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java
index a38fc76b..b28db71d 100644
--- a/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java
+++ b/src/main/java/org/apache/commons/dbcp2/managed/ManagedConnection.java
@@ -218,24 +218,20 @@ public class ManagedConnection<C extends Connection>
extends DelegatingConnectio
} finally {
lock.unlock();
}
-
// If we were using a shared connection, clear the reference now that
// the transaction has completed
if (isSharedConnection) {
setDelegate(null);
isSharedConnection = false;
}
-
// autoCommit may have been changed directly on the underlying
connection
clearCachedState();
-
// If this connection was closed during the transaction and there is
// still a delegate present close it
final Connection delegate = getDelegateInternal();
if (isClosedInternal() && delegate != null) {
try {
setDelegate(null);
-
if (!delegate.isClosed()) {
delegate.close();
}
@@ -261,15 +257,12 @@ public class ManagedConnection<C extends Connection>
extends DelegatingConnectio
// our listener is called. In that rare case, trigger the
transaction complete call now
transactionComplete();
}
-
// the existing transaction context ended (or we didn't have one), get
the active transaction context
transactionContext = transactionRegistry.getActiveTransactionContext();
-
// if there is an active transaction context, and it already has a
shared connection, use it
if (transactionContext != null &&
transactionContext.getSharedConnection() != null) {
// A connection for the connection factory has already been
enrolled
// in the transaction, replace our delegate with the enrolled
connection
-
// return current connection to the pool
@SuppressWarnings("resource")
final C connection = getDelegateInternal();
@@ -286,17 +279,14 @@ public class ManagedConnection<C extends Connection>
extends DelegatingConnectio
}
}
}
-
// add a listener to the transaction context
transactionContext.addTransactionContextListener(new
CompletionListener());
-
// Set our delegate to the shared connection. Note that this will
// always be of type C since it has been shared by another
// connection from the same pool.
@SuppressWarnings("unchecked")
final C shared = (C) transactionContext.getSharedConnection();
setDelegate(shared);
-
// remember that we are using a shared connection, so it can be
cleared after the
// transaction completes
isSharedConnection = true;
@@ -312,12 +302,10 @@ public class ManagedConnection<C extends Connection>
extends DelegatingConnectio
throw new SQLException("Unable to acquire a new connection
from the pool", e);
}
}
-
// if we have a transaction, out delegate becomes the shared
delegate
if (transactionContext != null) {
// add a listener to the transaction context
transactionContext.addTransactionContextListener(new
CompletionListener());
-
// register our connection as the shared connection
try {
transactionContext.setSharedConnection(connection);
