tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kin...@apache.org
Subject cvs commit: jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler Generator.java
Date Sat, 11 May 2002 01:19:58 GMT
kinman      02/05/10 18:19:58

  Modified:    jasper2/src/share/org/apache/jasper/compiler Generator.java
  Log:
  - Reverted to undo the last fix, as it fails on complicated tags.
  
  Revision  Changes    Path
  1.13      +6 -17     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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- Generator.java	9 May 2002 18:47:15 -0000	1.12
  +++ Generator.java	11 May 2002 01:19:57 -0000	1.13
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
1.12 2002/05/09 18:47:15 kinman Exp $
  - * $Revision: 1.12 $
  - * $Date: 2002/05/09 18:47:15 $
  + * $Header: /home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
1.13 2002/05/11 01:19:57 kinman Exp $
  + * $Revision: 1.13 $
  + * $Date: 2002/05/11 01:19:57 $
    *
    * ====================================================================
    * 
  @@ -1070,10 +1070,6 @@
                       out.print(tryBitVal.toString());
                       out.println(");");
   
  -                    out.printin("int ret = ");
  -                    out.print(tagHandlerVar);
  -                    out.println(".doEndTag();");
  -
   		    out.printin("if (");
   		    out.print(tagEvalVar);
   		    out.println(" != javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE)");
  @@ -1081,11 +1077,6 @@
   		    out.printil("out = pageContext.popBody();");
   		    out.popIndent();
   
  -                    out.printil("if (ret == javax.servlet.jsp.tagext.Tag.SKIP_PAGE)");
  -                    out.pushIndent();
  -                    out.printil("return;");
  -                    out.popIndent();
  -
                       finallies.beginPartMethod(tryBitVal.intValue());
                       finallies.print("      if (");
                       finallies.print("((Integer)tags.elementAt(");
  @@ -1102,14 +1093,12 @@
   		out.printil("}");
   	    }
   
  -            if (n.getBody() == null || !implementsBodyTag) {
  -	        out.printin("if (");
  -	        out.print(tagHandlerVar);
  -	        out.println(".doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE)");
  -	        out.pushIndent();
  -	        out.printil("return;");
  -	        out.popIndent();
  -            }
  +	    out.printin("if (");
  +	    out.print(tagHandlerVar);
  +	    out.println(".doEndTag() == javax.servlet.jsp.tagext.Tag.SKIP_PAGE)");
  +	    out.pushIndent();
  +	    out.printil("return;");
  +	    out.popIndent();
   
   	    // TryCatchFinally
   	    if (implementsTryCatchFinally) {
  
  
  

--
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