- Fix a potential memory leak: JspServlet holds an instance of

Kin Man Chung · Kin Man Chung · commit 2a4ac4b6830b · 2010-08-17T21:32:53.000Z
JspRuntimeContext, which in term, holds an instance of the WebAppClassLoader.
  Since JspServlet is loaded with the first JSP application, and has the
  life time of the web container, this WebAppClassLoader is kept alive, even
  after the application is undeployed.
  

svn path=/trunk/; revision=1275
diff --git a/impl/src/main/java/org/apache/jasper/JspCompilationContext.java b/impl/src/main/java/org/apache/jasper/JspCompilationContext.java
@@ -111,7 +111,7 @@ public class JspCompilationContext {
     private String baseURI;
     private String outputDir;
     private ServletContext context;
-    private URLClassLoader loader;
+    private ClassLoader loader;
 
     private JspRuntimeContext rctxt;
 
@@ -243,9 +243,9 @@ public void setClassPath(String classPath) {
      * this JSP?
      */
     public ClassLoader getClassLoader() {
-        if( loader != null )
-            return loader;
-        return rctxt.getParentClassLoader();
+        if( loader == null )
+            loader = rctxt.getParentClassLoader();
+        return loader;
     }
 
     public void setClassLoader(URLClassLoader loader) {
diff --git a/impl/src/main/java/org/apache/jasper/compiler/JspRuntimeContext.java b/impl/src/main/java/org/apache/jasper/compiler/JspRuntimeContext.java
@@ -171,13 +171,8 @@ public JspRuntimeContext(ServletContext context, Options options) {
         bytecodeBirthTimes = new ConcurrentHashMap<String, Long>(hashSize);
         packageMap = new  ConcurrentHashMap<String, Map<String, JavaFileObject>>();
 
-        // Get the parent class loader
-        parentClassLoader = Thread.currentThread().getContextClassLoader();
-        if (parentClassLoader == null) {
-            parentClassLoader = this.getClass().getClassLoader();
-        }
-
 	if (log.isLoggable(Level.FINEST)) {
+            ClassLoader parentClassLoader = getParentClassLoader();
 	    if (parentClassLoader != null) {
 		log.finest(Localizer.getMessage("jsp.message.parent_class_loader_is",
 					       parentClassLoader.toString()));
@@ -221,7 +216,6 @@ public JspRuntimeContext(ServletContext context, Options options) {
      */
     private ServletContext context;
     private Options options;
-    private ClassLoader parentClassLoader;
     private PermissionCollection permissionCollection;
     private CodeSource codeSource;                    
     private String classpath;
@@ -318,6 +312,11 @@ public CodeSource getCodeSource() {
      * @return ClassLoader parent
      */
     public ClassLoader getParentClassLoader() {
+        ClassLoader parentClassLoader =
+                Thread.currentThread().getContextClassLoader();
+        if (parentClassLoader == null) {
+            parentClassLoader = this.getClass().getClassLoader();
+        }
         return parentClassLoader;
     }
 
@@ -341,8 +340,6 @@ public void destroy() {
         for (JspServletWrapper jsw: jsps.values()) {
             jsw.destroy();
         }
-
-        parentClassLoader = null;
     }
 
     /**
@@ -580,6 +577,7 @@ private void initSecurity() {
                 permissionCollection.add( new RuntimePermission(
                     "accessClassInPackage.org.apache.jasper.runtime") );
 
+                ClassLoader parentClassLoader = getParentClassLoader();
                 if (parentClassLoader instanceof URLClassLoader) {
                     URL [] urls = ((URLClassLoader)parentClassLoader).getURLs();
                     String jarUrl = null;
