From 1101c4ef0f44a6a8d50add853d0a3d69cf07d43c Mon Sep 17 00:00:00 2001 From: markt Date: Tue, 5 Oct 2010 07:30:54 +0000 Subject: [PATCH] Correct fix fot 49669 git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1004550 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java | 3 ++- webapps/docs/changelog.xml | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java b/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java index 49e446ca8..9af75ca0b 100644 --- a/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java +++ b/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java @@ -23,9 +23,9 @@ import java.lang.reflect.Method; import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; -import java.security.Policy; import javax.imageio.ImageIO; +import javax.security.auth.Policy; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -50,6 +50,7 @@ import org.apache.tomcat.util.res.StringManager; * first disabling Jar URL connection caching. The workaround is to disable this * caching by default. */ +@SuppressWarnings("deprecation") public class JreMemoryLeakPreventionListener implements LifecycleListener { private static final Log log = diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml index 708f8c452..d6ec6d426 100644 --- a/webapps/docs/changelog.xml +++ b/webapps/docs/changelog.xml @@ -40,6 +40,10 @@ + 49669: Fix memoey leak triggered by using the deprecated + javax.security.auth.Policy class. (markt) + + 49922: Don't add filter twice to filter chain if the filter matches more than one URL pattern and/or Servlet name. (markt) -- 2.11.0