Author: markt
Date: Thu Nov 24 20:01:41 2016
New Revision: 1771211
URL: http://svn.apache.org/viewvc?rev=1771211&view=rev
Log:
Fix https://bz.apache.org/bugzilla/show_bug.cgi?id=60356
Fix pre-compilation of JSPs that depend on nested tag files packaged in a JAR.
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Modified:
tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=1771211&r1=1771210&r2=1771211&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
(original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
Thu Nov 24 20:01:41 2016
@@ -565,7 +565,7 @@ class TagFileProcessor {
JspServletWrapper tempWrapper = new JspServletWrapper(ctxt
.getServletContext(), ctxt.getOptions(),
tagFilePath, tagInfo, ctxt.getRuntimeContext(),
- ctxt.getTagFileJarResource(tagFilePath));
+ tagJarResouce);
// Use same classloader and classpath for compiling tag
files
tempWrapper.getJspEngineContext().setClassLoader(
ctxt.getClassLoader());
Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1771211&r1=1771210&r2=1771211&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Nov 24 20:01:41 2016
@@ -86,6 +86,14 @@
</scode>
</changelog>
</subsection>
+ <subsection name="Jasper">
+ <changelog>
+ <fix>
+ <bug>60356</bug>: Fix pre-compilation of JSPs that depend on nested tag
+ files packaged in a JAR. (markt)
+ </fix>
+ </changelog>
+ </subsection>
<subsection name="Web applications">
<changelog>
<fix>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
