kinman 02/05/09 10:50:50
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
- Thanks Denis Benoit <[EMAIL PROTECTED]> for the patch.
. Removes the doAfterBody() from the finallies method and replace it with the
check of the value of the "tagEvalVar" variable;
. Removes superfluous call to addTagToVector() in the pseudo "finally" clause;
. addTagToVector() accepts an Object since a Tag can be passed or an Integer;
Revision Changes Path
1.11 +9 -15
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Generator.java 6 May 2002 04:33:15 -0000 1.10
+++ Generator.java 9 May 2002 17:50:50 -0000 1.11
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
1.10 2002/05/06 04:33:15 glenn Exp $
- * $Revision: 1.10 $
- * $Date: 2002/05/06 04:33:15 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
1.11 2002/05/09 17:50:50 kinman Exp $
+ * $Revision: 1.11 $
+ * $Date: 2002/05/09 17:50:50 $
*
* ====================================================================
*
@@ -238,7 +238,7 @@
out.println();
out.println();
- out.printil("private void addTagToVector(java.util.Vector tags, int index,
javax.servlet.jsp.tagext.Tag tag) {");
+ out.printil("private void addTagToVector(java.util.Vector tags, int index,
Object tag) {");
out.pushIndent();
out.printil("if (index + 1 > tags.size())");
out.pushIndent();
@@ -1000,9 +1000,9 @@
out.println(");");
out.printin("addTagToVector(tags, ");
out.print(tryBitVal.toString());
- out.print(", ");
- out.print(tagHandlerVar);
- out.println(");");
+ out.print(", new Integer(");
+ out.print(tagEvalVar);
+ out.println("));");
out.printin("if (");
out.print(tagEvalVar);
out.println(" != javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE)
{");
@@ -1070,12 +1070,6 @@
out.print(tryBitVal.toString());
out.println(");");
- out.printin("addTagToVector(tags, ");
- out.print(tryBitVal.toString());
- out.print(", ");
- out.print(tagHandlerVar);
- out.println(");");
-
out.printin("if (");
out.print(tagEvalVar);
out.println(" != javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE)");
@@ -1085,9 +1079,9 @@
finallies.beginPartMethod(tryBitVal.intValue());
finallies.print(" if (");
-
finallies.print("((javax.servlet.jsp.tagext.BodyTag)tags.elementAt(");
+ finallies.print("((Integer)tags.elementAt(");
finallies.print(tryBitVal.toString());
- finallies.print(")).doAfterBody()");
+ finallies.print(")).intValue()");
finallies.println(" !=
javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE)");
finallies.println(" out = pageContext.popBody();");
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
