Author: markt
Date: Thu Oct 14 14:47:31 2010
New Revision: 1022557
URL: http://svn.apache.org/viewvc?rev=1022557&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50066
Compile recursive tag file if it depends on a JAR.
Patch provided by Sylvain Laurent.
Modified:
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1022557&r1=1022556&r2=1022557&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Oct 14 14:47:31 2010
@@ -251,13 +251,6 @@ PATCHES PROPOSED TO BACKPORT:
- Do not remove "// Make sure no session ID is returned" comment.
- Documentation update will be needed.
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50066
- Compile recursive tag file if it depends on a JAR. Patch provided by Sylvain
- Laurent.
- https://issues.apache.org/bugzilla/attachment.cgi?id=26149
- +1: markt, kkolinko, timw
- -1:
-
* Avoid unnecessary cast
http://svn.apache.org/viewvc?rev=1022134&view=rev
+1: markt, kkolinko, rjung, timw
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java?rev=1022557&r1=1022556&r2=1022557&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/TagFileProcessor.java
Thu Oct 14 14:47:31 2010
@@ -618,6 +618,10 @@ class TagFileProcessor {
.getServletContext(), ctxt.getOptions(),
tagFilePath, tagInfo, ctxt.getRuntimeContext(),
ctxt.getTagFileJarUrl(tagFilePath));
+ // Use same classloader and classpath for compiling tag
files
+ tempWrapper.getJspEngineContext().setClassLoader(
+ (URLClassLoader) ctxt.getClassLoader());
+
tempWrapper.getJspEngineContext().setClassPath(ctxt.getClassPath());
tagClazz = tempWrapper.loadTagFilePrototype();
tempVector.add(tempWrapper.getJspEngineContext()
.getCompiler());
Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1022557&r1=1022556&r2=1022557&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Oct 14 14:47:31 2010
@@ -163,6 +163,10 @@
<bug>49998</bug>: Make jsp:root detection work with single quoted
attributes as well. (timw)
</fix>
+ <fix>
+ <bug>50066</bug>: Compile a recursive tag file if it depends on a JAR.
+ Patch provided by Sylvain Laurent. (markt)
+ </fix>
</changelog>
</subsection>
<subsection name="Cluster">
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
