tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu...@apache.org
Subject cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java
Date Fri, 22 Nov 2002 23:47:16 GMT
luehe       2002/11/22 15:47:15

  Modified:    jasper2/src/share/org/apache/jasper/compiler Generator.java
  Log:
  Fixed 14699: Scripting variables declared AT_END do not work when tag
               implements TryCatchFinally.
  
  Revision  Changes    Path
  1.129     +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.128
  retrieving revision 1.129
  diff -u -r1.128 -r1.129
  --- Generator.java	19 Nov 2002 00:49:42 -0000	1.128
  +++ Generator.java	22 Nov 2002 23:47:15 -0000	1.129
  @@ -2023,10 +2023,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
  @@ -2050,8 +2046,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:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message