svn commit: r630019 - in /tomcat/trunk/java/org/apache/jasper: JspCompilationContext.java compiler/JspRuntimeContext.java

[markt]

Author: markt
Date: Thu Feb 21 14:02:50 2008
New Revision: 630019

URL: http://svn.apache.org/viewvc?rev=630019&view=rev
Log:
Revert r616563 which was a fix for bug 43878 that has now been marked as 
WONTFIX.

Modified:
    tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
    tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java

Modified: tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java?rev=630019&r1=630018&r2=630019&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java (original)
+++ tomcat/trunk/java/org/apache/jasper/JspCompilationContext.java Thu Feb 21 
14:02:50 2008
@@ -34,6 +34,7 @@
 import org.apache.jasper.compiler.JspUtil;
 import org.apache.jasper.compiler.Localizer;
 import org.apache.jasper.compiler.ServletWriter;
+import org.apache.jasper.servlet.JasperLoader;
 import org.apache.jasper.servlet.JspServletWrapper;
 
 /**
@@ -175,7 +176,11 @@
 
     public ClassLoader getJspLoader() {
         if( jspLoader == null ) {
-            jspLoader = rctxt.getJspLoader(baseUrl, getClassLoader());
+            jspLoader = new JasperLoader
+            (new URL[] {baseUrl},
+                    getClassLoader(),
+                    rctxt.getPermissionCollection(),
+                    rctxt.getCodeSource());
         }
         return jspLoader;
     }

Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java?rev=630019&r1=630018&r2=630019&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspRuntimeContext.java Thu Feb 
21 14:02:50 2008
@@ -38,7 +38,6 @@
 import org.apache.jasper.Options;
 import org.apache.jasper.runtime.JspFactoryImpl;
 import org.apache.jasper.security.SecurityClassLoad;
-import org.apache.jasper.servlet.JasperLoader;
 import org.apache.jasper.servlet.JspServletWrapper;
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -156,7 +155,6 @@
     private ServletContext context;
     private Options options;
     private URLClassLoader parentClassLoader;
-    private JasperLoader jspLoader;
     private PermissionCollection permissionCollection;
     private CodeSource codeSource;                    
     private String classpath;
@@ -316,26 +314,6 @@
      */
     public String getClassPath() {
         return classpath;
-    }
-
-
-    /**
-     * Obtain the classloader to use when loading JSP resources. In development
-     * mode or when running background compilations, each JSP has a separate
-     * classloader to enable easy re-loading of modified JSPs. If not in
-     * development mode, a single loader is used to reduce perm gen usage when
-     * many JSPs all use the same handful of tags.
-     */
-    public URLClassLoader getJspLoader(URL baseUrl, ClassLoader parent) {
-        if (options.getDevelopment() || lastCheck > -1) {
-            return new JasperLoader(new URL[] {baseUrl}, parent,
-                    permissionCollection, codeSource);
-        }
-        if (jspLoader == null) {
-            jspLoader = new JasperLoader(new URL[] {baseUrl}, parent,
-                    permissionCollection, codeSource);
-        }
-        return jspLoader;
     }
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]