tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lar...@locus.apache.org
Subject cvs commit: jakarta-tomcat/src/share/org/apache/jasper/runtime PageContextImpl.java
Date Thu, 14 Sep 2000 03:11:08 GMT
larryi      00/09/13 20:11:07

  Modified:    src/share/org/apache/jasper/compiler IncludeGenerator.java
               src/share/org/apache/jasper/runtime 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
  1.5       +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.5
  diff -u -r1.4 -r1.5
  --- IncludeGenerator.java	2000/06/11 21:41:06	1.4
  +++ IncludeGenerator.java	2000/09/14 03:11:05	1.5
  @@ -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.5 2000/09/14 03:11:05 larryi Exp $
  + * $Revision: 1.5 $
  + * $Date: 2000/09/14 03:11:05 $
    *
    * ====================================================================
    * 
  @@ -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();
  
  
  
  1.15      +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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- PageContextImpl.java	2000/07/11 03:48:36	1.14
  +++ PageContextImpl.java	2000/09/14 03:11:06	1.15
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
1.14 2000/07/11 03:48:36 alex Exp $
  - * $Revision: 1.14 $
  - * $Date: 2000/07/11 03:48:36 $
  + * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
1.15 2000/09/14 03:11:06 larryi Exp $
  + * $Revision: 1.15 $
  + * $Date: 2000/09/14 03:11:06 $
    *
    * ====================================================================
    *
  @@ -407,6 +407,7 @@
           throws ServletException, IOException
       {
           String path = getAbsolutePathRelativeToContext(relativeUrlPath);
  +        out.flush();
           context.getRequestDispatcher(path).include(request, response);
       }
   
  
  
  

Mime
View raw message