luehe 2002/11/22 15:47:32
Modified: jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch Generator.java
Log:
Fixed 14699: Scripting variables declared AT_END do not work when tag
implements TryCatchFinally.
Revision Changes Path
No revision
No revision
1.35.2.13 +9 -8
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.12
retrieving revision 1.35.2.13
diff -u -r1.35.2.12 -r1.35.2.13
--- Generator.java 19 Nov 2002 00:51:05 -0000 1.35.2.12
+++ Generator.java 22 Nov 2002 23:47:31 -0000 1.35.2.13
@@ -1445,10 +1445,6 @@
// Synchronize AT_BEGIN scripting variables
syncScriptingVars(n, VariableInfo.AT_BEGIN);
- // Declare and synchronize AT_END scripting variables
- declareScriptingVars(n, VariableInfo.AT_END);
- syncScriptingVars(n, VariableInfo.AT_END);
-
// TryCatchFinally
if (n.implementsTryCatchFinally()) {
out.popIndent(); // try
@@ -1472,8 +1468,13 @@
if (n.implementsTryCatchFinally()) {
out.popIndent();
- out.println("}");
+ out.printil("}");
}
+
+ // Declare and synchronize AT_END scripting variables (must do this
+ // outside the try/catch/finally block)
+ declareScriptingVars(n, VariableInfo.AT_END);
+ syncScriptingVars(n, VariableInfo.AT_END);
restoreScriptingVars(n, VariableInfo.AT_BEGIN);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
