Author: remy.maucherat(a)jboss.com
Date: 2010-11-25 04:59:34 -0500 (Thu, 25 Nov 2010)
New Revision: 1587
Modified:
trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
trunk/webapps/docs/changelog.xml
Log:
- 50066: Tag file processing fix.
Modified: trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
===================================================================
--- trunk/java/org/apache/jasper/compiler/TagFileProcessor.java 2010-11-25 09:56:13 UTC
(rev 1586)
+++ trunk/java/org/apache/jasper/compiler/TagFileProcessor.java 2010-11-25 09:59:34 UTC
(rev 1587)
@@ -618,6 +618,9 @@
.getServletContext(), ctxt.getOptions(),
tagFilePath, tagInfo, ctxt.getRuntimeContext(),
ctxt.getTagFileJarUrl(tagFilePath));
+ // Use same classloader and classpath for compiling tag files
+
tempWrapper.getJspEngineContext().setClassLoader(ctxt.getClassLoader());
+ tempWrapper.getJspEngineContext().setClassPath(ctxt.getClassPath());
tagClazz = tempWrapper.loadTagFilePrototype();
tempVector.add(tempWrapper.getJspEngineContext()
.getCompiler());
Modified: trunk/webapps/docs/changelog.xml
===================================================================
--- trunk/webapps/docs/changelog.xml 2010-11-25 09:56:13 UTC (rev 1586)
+++ trunk/webapps/docs/changelog.xml 2010-11-25 09:59:34 UTC (rev 1587)
@@ -57,6 +57,10 @@
<bug>49998</bug>: Handle single quoted attributes in detection of
jsp:root
element in XML syntax JSP files. (markt)
</fix>
+ <fix>
+ <bug>50066</bug>: Fix building of recursive tag files when the file
depends on a JAR file.
+ Patch provided by Sylvain Laurent. (markt)
+ </fix>
</changelog>
</subsection>
</section>