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.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1006330 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/java/org/apache/jasper/compiler/TagFileProcessor.java b/java/org/apache/jasper/compiler/TagFileProcessor.java
index 481f4fd..6197517 100644 (file)
--- a/java/org/apache/jasper/compiler/TagFileProcessor.java
+++ b/java/org/apache/jasper/compiler/TagFileProcessor.java
@@ -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());

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 011d76d..67e10ed 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -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">