This is an automated email from the ASF dual-hosted git repository. psteitz 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 be000e7a Format fixes, update changelog. be000e7a is described below commit be000e7a3e6f9819a2dca2c8c389006ab40bc71b Author: Phil Steitz <phil.ste...@gmail.com> AuthorDate: Thu Jan 18 18:33:06 2024 -0700 Format fixes, update changelog. --- src/changes/changes.xml | 1 + src/main/java/org/apache/commons/dbcp2/PoolableConnection.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/changes/changes.xml b/src/changes/changes.xml index 2b0c6448..f5617731 100644 --- a/src/changes/changes.xml +++ b/src/changes/changes.xml @@ -66,6 +66,7 @@ The <action> type attribute can be add,update,fix,remove. <!-- FIX --> <!-- ADD --> <!-- UPDATE --> + <action type="update" dev="psteitz" due-to="cortlepp-intershop">use ReentrantLock in PoolableConnection.close, #591</action> <action type="update" dev="ggregory" due-to="Gary Gregory">Bump commons-lang3 from 3.13.0 to 3.14.0.</action> </release> <release version="2.11.0" date="2023-10-23" description="This is a minor release, including bug fixes and enhancements."> diff --git a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java index b437ec82..9bc4059a 100644 --- a/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java +++ b/src/main/java/org/apache/commons/dbcp2/PoolableConnection.java @@ -24,9 +24,9 @@ import java.sql.SQLException; import java.time.Duration; import java.util.Collection; import java.util.concurrent.Executor; - import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; + import javax.management.InstanceAlreadyExistsException; import javax.management.MBeanRegistrationException; import javax.management.MBeanServer;