Author: markt
Date: Sat Sep 9 14:14:49 2006
New Revision: 441858
URL: http://svn.apache.org/viewvc?view=rev&rev=441858
Log:
Port fix for bug 31804 from TC5. Set the parent of unnested tags within a tag
file to be the tag represented by the tag file.
Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?view=diff&rev=441858&r1=441857&r2=441858
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Sat Sep
9 14:14:49 2006
@@ -2924,7 +2924,12 @@
}
// Set parent
- if (!simpleTag) {
+ if (isTagFile && parent == null) {
+ out.printin(tagHandlerVar);
+ out.print(".setParent(");
+ out.print("new javax.servlet.jsp.tagext.TagAdapter(");
+ out.print("(javax.servlet.jsp.tagext.SimpleTag) this ));");
+ } else if (!simpleTag) {
out.printin(tagHandlerVar);
out.print(".setParent(");
if (parent != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
