Correct fix fot 49669

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1004550 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java b/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
index 49e446c..9af75ca 100644 (file)
--- 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 708f8c4..d6ec6d4 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -40,6 +40,10 @@
   <subsection name="Catalina">
     <changelog>
       <fix>
+        <bug>49669</bug>: Fix memoey leak triggered by using the deprecated
+        javax.security.auth.Policy class. (markt)
+      </fix>
+      <fix>
         <bug>49922</bug>: Don&apos;t add filter twice to filter chain if the
         filter matches more than one URL pattern and/or Servlet name. (markt)
       </fix>