This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new dacb2b6 Update internal form of Apache Commons DBCP
dacb2b6 is described below
commit dacb2b6ef15d862b2d034732d3d779a577c2c537
Author: Mark Thomas <[email protected]>
AuthorDate: Fri May 3 16:46:30 2019 +0100
Update internal form of Apache Commons DBCP
---
MERGE.txt | 2 +-
java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java | 9 +++++----
java/org/apache/tomcat/dbcp/dbcp2/ObjectNameWrapper.java | 9 +++++++++
java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java | 2 +-
.../apache/tomcat/dbcp/dbcp2/managed/ManagedDataSource.java | 4 +++-
webapps/docs/changelog.xml | 12 ++++++++----
6 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index 5687de5..e28ca94 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -63,7 +63,7 @@ Sub-tree
src/main/java/org/apache/commons/dbcp2
src/main/resources/org/apache/commons/dbcp2
The SHA1 ID for the most recent commit to be merged to Tomcat is:
-de20b7779214cf8b0056aa61bb6d56c94ed3afb7
+dcdbc72acf51155d2a6c3f10461d9712a3623686 (2019-04-24)
Pool2
Sub-tree
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
index bf008d8..37f036d 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/BasicDataSource.java
@@ -418,12 +418,12 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
registeredJmxObjectName = null;
}
closed = true;
- final GenericObjectPool<?> oldpool = connectionPool;
+ final GenericObjectPool<?> oldPool = connectionPool;
connectionPool = null;
dataSource = null;
try {
- if (oldpool != null) {
- oldpool.close();
+ if (oldPool != null) {
+ oldPool.close();
}
} catch (final RuntimeException e) {
throw e;
@@ -1506,7 +1506,8 @@ public class BasicDataSource implements DataSource,
BasicDataSourceMXBean, MBean
/**
* Manually evicts idle connections.
*
- * @throws Exception when there is a problem evicting idle objects.
+ * @throws Exception Thrown by {@link GenericObjectPool#evict()}.
+ * @see GenericObjectPool#evict()
*/
public void evict() throws Exception {
if (connectionPool != null) {
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/ObjectNameWrapper.java
b/java/org/apache/tomcat/dbcp/dbcp2/ObjectNameWrapper.java
index f036989..9c78936 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/ObjectNameWrapper.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/ObjectNameWrapper.java
@@ -18,6 +18,7 @@
package org.apache.tomcat.dbcp.dbcp2;
import java.lang.management.ManagementFactory;
+import java.util.Objects;
import javax.management.MBeanServer;
import javax.management.MalformedObjectNameException;
@@ -76,6 +77,14 @@ class ObjectNameWrapper {
}
}
+ /**
+ * @since 2.7.0
+ */
+ @Override
+ public String toString() {
+ return Objects.toString(objectName);
+ }
+
public void unregisterMBean() {
if (MBEAN_SERVER == null || objectName == null) {
return;
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
index 70601b0..38a0472 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/PoolingDataSource.java
@@ -75,7 +75,7 @@ public class PoolingDataSource<C extends Connection>
implements DataSource, Auto
* @since 2.1
*/
@Override
- public void close() throws Exception {
+ public void close() throws RuntimeException, SQLException {
try {
pool.close();
} catch (final RuntimeException rte) {
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedDataSource.java
b/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedDataSource.java
index 50c825b..74ae7cf 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedDataSource.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/managed/ManagedDataSource.java
@@ -65,8 +65,10 @@ public class ManagedDataSource<C extends Connection> extends
PoolingDataSource<C
}
/**
- * @return The transaction registry
+ * Gets the transaction registry.
*
+ * @return The transaction registry.
+ * @see #setTransactionRegistry(TransactionRegistry)
* @since 2.6.0
*/
public TransactionRegistry getTransactionRegistry() {
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index fbe9bd5..7c77575 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -210,10 +210,14 @@
When using the <code>OneLineFormatter</code>, don't print a blank line
in the log after printing a stack trace. (markt)
</fix>
- <add>
- Update the internal fork of Apache Commons FileUpload to pick up the
- changes since the Apache Commons FileUpload 1.4 release. (markt)
- </add>
+ <update>
+ Update the internal fork of Apache Commons FileUpload to 41e4047
+ (2019-04-24) pick up some enhancements. (markt)
+ </update>
+ <update>
+ Update the internal fork of Apache Commons DBCP 2 to
+ (2019-04-24) to pick up some clean-up and enhancements. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
