This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 1883de7bba Fix BZ 66330
1883de7bba is described below
commit 1883de7bbaf8e3da5c57529a0e8fe88f766d817c
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Nov 1 12:30:11 2022 +0000
Fix BZ 66330
Correct a regression introduced when fixing bug 62897 that meant any
value configured for skipMemoryLeakChecksOnJvmShutdown on the Context
was ignored and the default was always used.
https://bz.apache.org/bugzilla/show_bug.cgi?id=66330
---
java/org/apache/catalina/core/StandardContext.java | 1 +
webapps/docs/changelog.xml | 7 +++++++
2 files changed, 8 insertions(+)
diff --git a/java/org/apache/catalina/core/StandardContext.java
b/java/org/apache/catalina/core/StandardContext.java
index caeb3b2514..2028d76f00 100644
--- a/java/org/apache/catalina/core/StandardContext.java
+++ b/java/org/apache/catalina/core/StandardContext.java
@@ -5020,6 +5020,7 @@ public class StandardContext extends ContainerBase
cl.setClearReferencesHttpClientKeepAliveThread(getClearReferencesHttpClientKeepAliveThread());
cl.setClearReferencesObjectStreamClassCaches(getClearReferencesObjectStreamClassCaches());
cl.setClearReferencesThreadLocals(getClearReferencesThreadLocals());
+
cl.setSkipMemoryLeakChecksOnJvmShutdown(getSkipMemoryLeakChecksOnJvmShutdown());
}
// By calling unbindThread and bindThread in a row, we setup
the
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 7c3038427e..08fbbc26c3 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -116,6 +116,13 @@
<code>Context</code> to <code>WebResourceRoot</code>. Based on a patch
provided by Rahul Jaisimha. (markt)
</add>
+ <fix>
+ <bug>66330</bug>: Correct a regression introduced when fixing
+ <bug>62897</bug> that meant any value configured for
+ <code>skipMemoryLeakChecksOnJvmShutdown</code> on the
+ <code>Context</code> was ignored and the default was always used.
+ (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Coyote">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
