Author: markt
Date: Thu Feb 11 16:55:26 2010
New Revision: 909072
URL: http://svn.apache.org/viewvc?rev=909072&view=rev
Log:
Revert simple ResourceBundle fix
On reflection (no pun intended) a reflection based will be better since
- it can be implemented at a single point
- it can easily be ported to Tomcat 6
- it will be able to handle any exotic class loader structures created by apps
Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=909072&r1=909071&r2=909072&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Thu Feb
11 16:55:26 2010
@@ -47,7 +47,6 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-import java.util.ResourceBundle;
import java.util.Vector;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.jar.Attributes;
@@ -1774,9 +1773,6 @@
org.apache.juli.logging.LogFactory.release(this);
}
- // Clear any cached resource bundles
- ResourceBundle.clearCache(this);
-
// Clear the classloader reference in the VM's bean introspector
java.beans.Introspector.flushCaches();
Modified: tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java?rev=909072&r1=909071&r2=909072&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/servlet/JspServletWrapper.java Thu Feb
11 16:55:26 2010
@@ -20,7 +20,6 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.net.URL;
-import java.util.ResourceBundle;
import javax.servlet.Servlet;
import javax.servlet.ServletConfig;
@@ -417,9 +416,6 @@
public void destroy() {
if (theServlet != null) {
- // Memory leak prevention - ResourceBundle caches resources based
- // on class loader
- ResourceBundle.clearCache(ctxt.getJspLoader());
theServlet.destroy();
InstanceManager instanceManager =
InstanceManagerFactory.getInstanceManager(config);
try {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
