luehe 2003/02/24 08:38:41
Modified: jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch Generator.java
Log:
Fixed 17049: Invalid code generated when nesting tags
Revision Changes Path
No revision
No revision
1.35.2.20 +15 -5
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java
Index: Generator.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
retrieving revision 1.35.2.19
retrieving revision 1.35.2.20
diff -u -r1.35.2.19 -r1.35.2.20
--- Generator.java 13 Feb 2003 18:15:45 -0000 1.35.2.19
+++ Generator.java 24 Feb 2003 16:38:41 -0000 1.35.2.20
@@ -1123,7 +1123,12 @@
out.print(", ");
}
// out.println("pageContext, _jspxState)");
- out.println("pageContext))");
+ out.print("pageContext");
+ if (pushBodyCountVar != null) {
+ out.print(", ");
+ out.print(pushBodyCountVar);
+ }
+ out.println("))");
out.pushIndent();
out.printil((methodNesting > 0)? "return true;": "return;");
out.popIndent();
@@ -1147,7 +1152,12 @@
out.print(", ");
}
// out.println("javax.servlet.jsp.PageContext pageContext, JspxState
_jspxState)");
- out.println("javax.servlet.jsp.PageContext pageContext)");
+ out.print("javax.servlet.jsp.PageContext pageContext");
+ if (pushBodyCountVar != null) {
+ out.print(", int ");
+ out.print(pushBodyCountVar);
+ }
+ out.println(")");
out.printil(" throws Throwable {");
out.pushIndent();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
