Author: markt
Date: Tue Oct 5 07:30:54 2010
New Revision: 1004550
URL: http://svn.apache.org/viewvc?rev=1004550&view=rev
Log:
Correct fix fot 49669
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java?rev=1004550&r1=1004549&r2=1004550&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
Tue Oct 5 07:30:54 2010
@@ -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.String
* 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 =
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1004550&r1=1004549&r2=1004550&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Tue Oct 5 07:30:54 2010
@@ -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't add filter twice to filter chain if the
filter matches more than one URL pattern and/or Servlet name. (markt)
</fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]