tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r441370 - in /tomcat: container/tc5.5.x/webapps/docs/changelog.xml jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java
Date Fri, 08 Sep 2006 04:22:13 GMT
Author: markt
Date: Thu Sep  7 21:22:09 2006
New Revision: 441370

URL: http://svn.apache.org/viewvc?view=rev&rev=441370
Log:
Fix bug 31804. Set the parent of unnested tags within a tag file to be the tag represented
by the tag file.

Modified:
    tomcat/container/tc5.5.x/webapps/docs/changelog.xml
    tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=441370&r1=441369&r2=441370
==============================================================================
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Thu Sep  7 21:22:09 2006
@@ -14,6 +14,18 @@
   </properties>
 
 <body>
+<section name="Tomcat 5.5.20 (fhanik)">
+  <subsection name="Jasper">
+    <changelog>
+      <fix>
+        <bug>31804</bug>: Unnested tags within a tag file are now configured
+        with the Tag represented by the containing tag file as their parent tag.
+      </fix>
+    </changelog>
+  </subsection>   
+</section>
+
+
 <section name="Tomcat 5.5.19 (fhanik)">
   <subsection name="General">
     <changelog>

Modified: tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java
URL: http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java?view=diff&rev=441370&r1=441369&r2=441370
==============================================================================
--- tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/Generator.java Thu Sep  7 21:22:09
2006
@@ -2825,7 +2825,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: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message