remm 2005/02/08 06:06:36
Modified: jasper2/src/share/org/apache/jasper JspC.java
Log:
- 33373: Fix handling of context classloader in jspc. The loader classLoader
must be set on each compilation.
Revision Changes Path
1.91 +4 -6
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java
Index: JspC.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/JspC.java,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- JspC.java 22 Nov 2004 14:44:55 -0000 1.90
+++ JspC.java 8 Feb 2005 14:06:36 -0000 1.91
@@ -837,9 +837,11 @@
clctxt.setServletPackageName(targetPackage);
}
+ originalClassLoader =
Thread.currentThread().getContextClassLoader();
if( loader==null ) {
- originalClassLoader = initClassLoader( clctxt );
+ initClassLoader( clctxt );
}
+ Thread.currentThread().setContextClassLoader(loader);
clctxt.setClassLoader(loader);
clctxt.setClassPath(classPath);
@@ -1096,7 +1098,7 @@
* @return The original classloader before modifying
* @throws IOException If an error occurs
*/
- private ClassLoader initClassLoader(JspCompilationContext clctxt)
+ private void initClassLoader(JspCompilationContext clctxt)
throws IOException {
classPath = getClassPath();
@@ -1174,10 +1176,6 @@
urls.toArray(urlsA);
loader = new URLClassLoader(urlsA, this.getClass().getClassLoader());
- ClassLoader originalClassLoader =
Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader(loader);
-
- return originalClassLoader;
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
