luehe 2003/01/14 16:20:46
Modified: jasper2/src/share/org/apache/jasper/compiler Tag:
tomcat_4_branch Generator.java
jasper2/src/share/org/apache/jasper/runtime Tag:
tomcat_4_branch PageContextImpl.java
Log:
Fixed 15105: pushBody()/popBody() error on tomcat 4.1.X
Revision Changes Path
No revision
No revision
1.35.2.15 +3 -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.35.2.14
retrieving revision 1.35.2.15
diff -u -r1.35.2.14 -r1.35.2.15
--- Generator.java 8 Jan 2003 22:24:28 -0000 1.35.2.14
+++ Generator.java 15 Jan 2003 00:20:46 -0000 1.35.2.15
@@ -1368,7 +1368,6 @@
// Assume EVAL_BODY_BUFFERED
out.pushIndent();
out.printil("javax.servlet.jsp.tagext.BodyContent _bc =
pageContext.pushBody();");
- out.printil("_bc.clear();");
out.printil("out = _bc;");
out.printin(tagHandlerVar);
No revision
No revision
1.11.2.5 +6 -3
jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java
Index: PageContextImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-jasper/jasper2/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
retrieving revision 1.11.2.4
retrieving revision 1.11.2.5
diff -u -r1.11.2.4 -r1.11.2.5
--- PageContextImpl.java 8 Nov 2002 14:56:44 -0000 1.11.2.4
+++ PageContextImpl.java 15 Jan 2003 00:20:46 -0000 1.11.2.5
@@ -448,7 +448,10 @@
newOuts[depth] = new BodyContentImpl(out);
outs = newOuts;
}
+
+ outs[depth].clearBody();
out = outs[depth];
+
return outs[depth];
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
