You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by la...@locus.apache.org on 2000/09/14 05:09:50 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/jasper/runtime PageContextImpl.java
larryi 00/09/13 20:09:49
Modified: src/share/org/apache/jasper/compiler Tag: tomcat_32
IncludeGenerator.java
src/share/org/apache/jasper/runtime Tag: tomcat_32
PageContextImpl.java
Log:
The API doc says for PageContext.include():
"The current JspWriter "out" for this JSP is flushed as a side-effect of this
call, prior to processing the include."
Adding the out.flush() call to PageContext.include() and removing it from
the code generation for <jsp:include ...>.
Will update Watchdog to match the corrected behavior.
Revision Changes Path
No revision
No revision
1.4.2.1 +3 -4 jakarta-tomcat/src/share/org/apache/jasper/compiler/IncludeGenerator.java
Index: IncludeGenerator.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- IncludeGenerator.java 2000/06/11 21:41:06 1.4
+++ IncludeGenerator.java 2000/09/14 03:09:46 1.4.2.1
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v 1.4 2000/06/11 21:41:06 mandar Exp $
- * $Revision: 1.4 $
- * $Date: 2000/06/11 21:41:06 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v 1.4.2.1 2000/09/14 03:09:46 larryi Exp $
+ * $Revision: 1.4.2.1 $
+ * $Date: 2000/09/14 03:09:46 $
*
* ====================================================================
*
@@ -119,7 +119,6 @@
writer.println("{");
writer.pushIndent();
writer.println("String _jspx_qStr = \"\";");
- writer.println("out.flush();");
if (params.size() > 0) {
Enumeration en = params.keys();
No revision
No revision
1.13.2.1 +4 -3 jakarta-tomcat/src/share/org/apache/jasper/runtime/PageContextImpl.java
Index: PageContextImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- PageContextImpl.java 2000/06/30 20:21:04 1.13
+++ PageContextImpl.java 2000/09/14 03:09:49 1.13.2.1
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/PageContextImpl.java,v 1.13 2000/06/30 20:21:04 costin Exp $
- * $Revision: 1.13 $
- * $Date: 2000/06/30 20:21:04 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/PageContextImpl.java,v 1.13.2.1 2000/09/14 03:09:49 larryi Exp $
+ * $Revision: 1.13.2.1 $
+ * $Date: 2000/09/14 03:09:49 $
*
* ====================================================================
*
@@ -404,6 +404,7 @@
throws ServletException, IOException
{
String path = getAbsolutePathRelativeToContext(relativeUrlPath);
+ out.flush();
context.getRequestDispatcher(path).include(request, response);
}