luehe 2003/01/08 14:15:57
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
Applied patch provided by Dimitry Ivanov to fix synchronization of
AT_BEGIN and NESTED variables for tag handlers implementing BodyTag
whose doStartTag() returns EVAL_BODY_INCLUDE
Revision Changes Path
1.146 +6 -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.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- Generator.java 8 Jan 2003 18:42:42 -0000 1.145
+++ Generator.java 8 Jan 2003 22:15:56 -0000 1.146
@@ -1980,12 +1980,13 @@
out.printin(tagHandlerVar);
out.println(".doInitBody();");
+ out.popIndent();
+ out.printil("}");
+
// Synchronize AT_BEGIN and NESTED scripting variables
syncScriptingVars(n, VariableInfo.AT_BEGIN);
syncScriptingVars(n, VariableInfo.NESTED);
- out.popIndent();
- out.printil("}");
} else {
// Synchronize NESTED scripting variables
syncScriptingVars(n, VariableInfo.NESTED);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
