remm 2002/06/10 14:08:30
Modified: jasper2/src/share/org/apache/jasper/compiler Generator.java
Log:
- Fix problems with JSTL. The timing of the clear of the BodyContent was
incorrect. Now, it is cleared when the buffer is reused.
Revision Changes Path
1.23 +7 -4
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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Generator.java 10 Jun 2002 20:12:26 -0000 1.22
+++ Generator.java 10 Jun 2002 21:08:30 -0000 1.23
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
1.22 2002/06/10 20:12:26 remm Exp $
- * $Revision: 1.22 $
- * $Date: 2002/06/10 20:12:26 $
+ * $Header:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/compiler/Generator.java,v
1.23 2002/06/10 21:08:30 remm Exp $
+ * $Revision: 1.23 $
+ * $Date: 2002/06/10 21:08:30 $
*
* ====================================================================
*
@@ -1271,6 +1271,10 @@
out.pushIndent();
out.printil("_jspxState.outs[_jspxState.tagDepth] = new
org.apache.jasper.runtime.BodyContentImpl(out);");
out.popIndent();
+ out.printil("} else {");
+ out.pushIndent();
+ out.printil("_jspxState.outs[_jspxState.tagDepth].clear();");
+ out.popIndent();
out.printil("}");
out.printil("out = _jspxState.outs[_jspxState.tagDepth];");
@@ -1332,7 +1336,6 @@
out.print(tagEvalVar);
out.println(" != javax.servlet.jsp.tagext.Tag.EVAL_BODY_INCLUDE)");
out.pushIndent();
- out.printil("_jspxState.outs[_jspxState.tagDepth].clear();");
if (!implementsTryCatchFinally) {
out.printil("_jspxState.tagCount--;");
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
