luehe 2003/01/30 12:30:52
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
Fixed out-of-scope problem with pushBody count variables when custom
tag invocations are separated out into their own methods
Revision Changes Path
1.157 +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.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- Generator.java 28 Jan 2003 22:06:27 -0000 1.156
+++ Generator.java 30 Jan 2003 20:30:51 -0000 1.157
@@ -1524,7 +1524,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();
@@ -1548,7 +1553,12 @@
out.print(", ");
}
// out.println("PageContext pageContext, JspxState _jspxState)");
- out.println("PageContext pageContext)");
+ out.print("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]
