Author: markt
Date: Sun Oct 10 18:16:00 2010
New Revision: 1006330
URL: http://svn.apache.org/viewvc?rev=1006330&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50066
Fix building of recursive tag files when the file depends on a JAR file. Patch
provided by Sylvain Laurent.
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/trunk/webapps/docs/changelog.xml
Modified: tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=1006330&r1=1006329&r2=1006330&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java Sun Oct
10 18:16:00 2010
@@ -565,6 +565,10 @@ class TagFileProcessor {
.getServletContext(), ctxt.getOptions(),
tagFilePath, tagInfo, ctxt.getRuntimeContext(),
ctxt.getTagFileJarResource(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: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1006330&r1=1006329&r2=1006330&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Sun Oct 10 18:16:00 2010
@@ -156,6 +156,10 @@
Don't swallow exceptions when processing TLD files and handle the
case when there is no web.xml file. (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>
<subsection name="Web applications">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
