This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1706b31a01befb73553d2ae29240ff70c76b3f0c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Fri Dec 6 16:34:07 2019 +0000
Merge in DBCP 2 changes 2 a363390 (2019-12-06, 2.7.1-SNAPSHOT)
---
MERGE.txt | 2 +-
.../apache/tomcat/dbcp/dbcp2/AbandonedTrace.java | 92 +++++++++++-----------
webapps/docs/changelog.xml | 4 +
3 files changed, 51 insertions(+), 47 deletions(-)
diff --git a/MERGE.txt b/MERGE.txt
index 7daec6d..5551fb2 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -69,4 +69,4 @@ 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:
-4813b7f5456c1f4fecc4f701ac731a71f57db249 (2019-08-09)
+a363906bf7a039f79c07fa3c68b082a69ae035d7 (2019-12-06)
diff --git a/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
b/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
index 3969480..671e3e6 100644
--- a/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
+++ b/java/org/apache/tomcat/dbcp/dbcp2/AbandonedTrace.java
@@ -58,45 +58,6 @@ public class AbandonedTrace implements TrackedUse {
}
/**
- * Initializes abandoned tracing for this object.
- *
- * @param parent
- * AbandonedTrace parent object.
- */
- private void init(final AbandonedTrace parent) {
- if (parent != null) {
- parent.addTrace(this);
- }
- }
-
- /**
- * Gets the last time this object was used in milliseconds.
- *
- * @return long time in milliseconds.
- */
- @Override
- public long getLastUsed() {
- return lastUsedMillis;
- }
-
- /**
- * Sets the time this object was last used to the current time in
milliseconds.
- */
- protected void setLastUsed() {
- lastUsedMillis = System.currentTimeMillis();
- }
-
- /**
- * Sets the time in milliseconds this object was last used.
- *
- * @param lastUsedMillis
- * time in milliseconds.
- */
- protected void setLastUsed(final long lastUsedMillis) {
- this.lastUsedMillis = lastUsedMillis;
- }
-
- /**
* Adds an object to the list of objects being traced.
*
* @param trace
@@ -119,6 +80,16 @@ public class AbandonedTrace implements TrackedUse {
}
/**
+ * Gets the last time this object was used in milliseconds.
+ *
+ * @return long time in milliseconds.
+ */
+ @Override
+ public long getLastUsed() {
+ return lastUsedMillis;
+ }
+
+ /**
* Gets a list of objects being traced by this object.
*
* @return List of objects.
@@ -145,6 +116,30 @@ public class AbandonedTrace implements TrackedUse {
}
/**
+ * Initializes abandoned tracing for this object.
+ *
+ * @param parent
+ * AbandonedTrace parent object.
+ */
+ private void init(final AbandonedTrace parent) {
+ if (parent != null) {
+ parent.addTrace(this);
+ }
+ }
+
+ /**
+ * Removes this object the source object is tracing.
+ *
+ * @param source The object tracing
+ * @since 2.7.0
+ */
+ protected void removeThisTrace(final Object source) {
+ if (source instanceof AbandonedTrace) {
+ AbandonedTrace.class.cast(source).removeTrace(this);
+ }
+ }
+
+ /**
* Removes a child object this object is tracing.
*
* @param trace
@@ -167,14 +162,19 @@ public class AbandonedTrace implements TrackedUse {
}
/**
- * Removes this object the source object is tracing.
+ * Sets the time this object was last used to the current time in
milliseconds.
+ */
+ protected void setLastUsed() {
+ lastUsedMillis = System.currentTimeMillis();
+ }
+
+ /**
+ * Sets the time in milliseconds this object was last used.
*
- * @param source The object tracing
- * @since 2.7.0
+ * @param lastUsedMillis
+ * time in milliseconds.
*/
- protected void removeThisTrace(final Object source) {
- if (source instanceof AbandonedTrace) {
- AbandonedTrace.class.cast(source).removeTrace(this);
- }
+ protected void setLastUsed(final long lastUsedMillis) {
+ this.lastUsedMillis = lastUsedMillis;
}
}
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 86adeab..87e9e84 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -217,6 +217,10 @@
Update the internal fork of Apache Commons Pool 2 to 6092f92
(2019-12-06,
2.8.0-SNAPSHOT). Clean-up and minor refactoring. (markt)
</add>
+ <add>
+ Update the internal fork of Apache Commons DBCP 2 to a36390
(2019-12-06,
+ 2.7.1-SNAPSHOT). Minor refactoring. (markt)
+ </add>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
