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
The following commit(s) were added to refs/heads/8.5.x by this push: new 3b4ad6fc54 Fix BZ 66330 3b4ad6fc54 is described below commit 3b4ad6fc547616c666839bbcbdfe68e9dcd1d01a 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 | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/java/org/apache/catalina/core/StandardContext.java b/java/org/apache/catalina/core/StandardContext.java index 4371732fa5..2156995af9 100644 --- a/java/org/apache/catalina/core/StandardContext.java +++ b/java/org/apache/catalina/core/StandardContext.java @@ -5087,6 +5087,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 def52a2c8c..bbbd2e97c9 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -105,6 +105,17 @@ issues do not "pop up" wrt. others). --> <section name="Tomcat 8.5.84 (schultz)" rtext="in development"> + <subsection name="Catalina"> + <changelog> + <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"> <changelog> <fix> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org