You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by pi...@locus.apache.org on 2000/09/15 17:42:46 UTC
cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler IncludeGenerator.java
pierred 00/09/15 08:42:44
Modified: jasper/src/share/org/apache/jasper/runtime
PageContextImpl.java
jasper/src/share/org/apache/jasper/compiler
IncludeGenerator.java
Log:
Apply larryi fixes to jasper in tomcat-4.0.
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 ...>.
Submitted by: larryi
Revision Changes Path
1.2 +4 -3 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/PageContextImpl.java
Index: PageContextImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PageContextImpl.java 2000/08/12 00:52:13 1.1
+++ PageContextImpl.java 2000/09/15 15:42:40 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/PageContextImpl.java,v 1.1 2000/08/12 00:52:13 pierred Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/12 00:52:13 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/PageContextImpl.java,v 1.2 2000/09/15 15:42:40 pierred Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/09/15 15:42:40 $
*
* ====================================================================
*
@@ -407,6 +407,7 @@
throws ServletException, IOException
{
String path = getAbsolutePathRelativeToContext(relativeUrlPath);
+ out.flush();
context.getRequestDispatcher(path).include(request, response);
}
1.2 +3 -4 jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/IncludeGenerator.java
Index: IncludeGenerator.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IncludeGenerator.java 2000/08/12 00:52:07 1.1
+++ IncludeGenerator.java 2000/09/15 15:42:43 1.2
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v 1.1 2000/08/12 00:52:07 pierred Exp $
- * $Revision: 1.1 $
- * $Date: 2000/08/12 00:52:07 $
+ * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/compiler/IncludeGenerator.java,v 1.2 2000/09/15 15:42:43 pierred Exp $
+ * $Revision: 1.2 $
+ * $Date: 2000/09/15 15:42:43 $
*
* ====================================================================
*
@@ -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();