This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/main by this push: new e4ea23e295 Fix BZ 66330 e4ea23e295 is described below commit e4ea23e29559f18b587a9b621bba82955db28703 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 d21ea4fed5..6a3ba578f0 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -5002,6 +5002,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 39722f37c1..de46e2c392 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -124,6 +124,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