You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2022/11/01 13:51:10 UTC

[tomcat] branch 9.0.x updated: Fix BZ 66330

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
     new 076b4b38c8 Fix BZ 66330
076b4b38c8 is described below

commit 076b4b38c80929eb3a5cd8df9cdc9f0935711718
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 26639ef22c..3d86ee343f 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 28105c2e10..c202144015 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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org