From: markt Date: Sun, 10 Oct 2010 18:16:00 +0000 (+0000) Subject: Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50066 X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=108150af7dfdbcf4546fc23fe89df9c3268baf0a;p=tomcat7.0 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 481f4fd06..6197517e2 100644 --- 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 011d76de9..67e10edbb 100644 --- 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) + + 50066: Fix building of recursive tag files when the file + depends on a JAR file. Patch provided by Sylvain Laurent. (markt) +