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 Mon, 07 Apr 2003 20:56:49 GMT
luehe       2003/04/07 13:56:49

  Modified:    jasper2/src/share/org/apache/jasper/compiler Generator.java
  Log:
  Fixed 18778: popBody not always called as expected resulting in unexpected output
  
  Revision  Changes    Path
  1.181     +11 -11    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.180
  retrieving revision 1.181
  diff -u -r1.180 -r1.181
  --- Generator.java	2 Apr 2003 02:04:00 -0000	1.180
  +++ Generator.java	7 Apr 2003 20:56:49 -0000	1.181
  @@ -1496,7 +1496,7 @@
   //		out.println("PageContext pageContext, JspxState _jspxState)");
   		out.print("PageContext pageContext");
   		if (pushBodyCountVar != null) {
  -		    out.print(", int ");
  +		    out.print(", int[] ");
   		    out.print(pushBodyCountVar);
   		}
   		out.println(")");
  @@ -1889,9 +1889,9 @@
   	    generateSetters(n, tagHandlerVar, handlerInfo, false);
   	    
               if (n.implementsTryCatchFinally()) {
  -		out.printin("int ");
  +		out.printin("int[] ");
   		out.print(tagPushBodyCountVar);
  -		out.println(" = 0;");
  +		out.println(" = new int[] { 0 };");
                   out.printil("try {");
                   out.pushIndent();
               }
  @@ -1925,10 +1925,10 @@
   		    out.printil("out = pageContext.pushBody();");
   		    if (n.implementsTryCatchFinally()) {
   			out.printin(tagPushBodyCountVar);
  -			out.println("++;");
  +			out.println("[0]++;");
   		    } else if (pushBodyCountVar != null) {
   			out.printin(pushBodyCountVar);
  -			out.println("++;");
  +			out.println("[0]++;");
   		    }
   		    out.printin(tagHandlerVar);
   		    out.println(".setBodyContent((javax.servlet.jsp.tagext.BodyContent) out);");
  @@ -1988,10 +1988,10 @@
                       out.printil("out = pageContext.popBody();");
   		    if (n.implementsTryCatchFinally()) {
   			out.printin(tagPushBodyCountVar);
  -			out.println("--;");
  +			out.println("[0]--;");
   		    } else if (pushBodyCountVar != null) {
   			out.printin(pushBodyCountVar);
  -			out.println("--;");
  +			out.println("[0]--;");
   		    }
   		    out.popIndent();
   		}
  @@ -2022,7 +2022,7 @@
   
   		out.printin("while (");
   		out.print(tagPushBodyCountVar);
  -		out.println("-- > 0)");
  +		out.println("[0]-- > 0)");
   		out.pushIndent();
   		out.printil("out = pageContext.popBody();");
   		out.popIndent();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message