tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kin...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime PageContextImpl.java
Date Sat, 15 Dec 2001 00:18:48 GMT
kinman      01/12/14 16:18:48

  Modified:    jasper/src/share/org/apache/jasper/runtime Tag:
                        tomcat_40_branch PageContextImpl.java
  Log:
  - Retract the fix for 5345 (sendRedirect() in scriplet not working).  It
    causes <jsp:include> not to work after response has been committed.
    The container should fix this instead.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.13.2.3  +11 -14    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.13.2.2
  retrieving revision 1.13.2.3
  diff -u -r1.13.2.2 -r1.13.2.3
  --- PageContextImpl.java	2001/12/12 01:28:39	1.13.2.2
  +++ PageContextImpl.java	2001/12/15 00:18:48	1.13.2.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
1.13.2.2 2001/12/12 01:28:39 kinman Exp $
  - * $Revision: 1.13.2.2 $
  - * $Date: 2001/12/12 01:28:39 $
  + * $Header: /home/cvs/jakarta-tomcat-4.0/jasper/src/share/org/apache/jasper/runtime/PageContextImpl.java,v
1.13.2.3 2001/12/15 00:18:48 kinman Exp $
  + * $Revision: 1.13.2.3 $
  + * $Date: 2001/12/15 00:18:48 $
    *
    * ====================================================================
    *
  @@ -169,18 +169,15 @@
       }
   
       public void release() {
  -        // Flush the out stream only if the response is not committed.
  -        if (! response.isCommitted()) {
  -            try {
  -                if (isIncluded) {
  -                    ((JspWriterImpl)out).flushBuffer();
  -                                // push it into the including jspWriter
  -                } else {
  -                    out.flush();
  -                }
  -            } catch (IOException ex) {
  -                loghelper.log("Internal error flushing the buffer in release()");
  +        try {
  +            if (isIncluded) {
  +                ((JspWriterImpl)out).flushBuffer();
  +                            // push it into the including jspWriter
  +            } else {
  +                out.flush();
               }
  +        } catch (IOException ex) {
  +            loghelper.log("Internal error flushing the buffer in release()");
           }
   	servlet      = null;
   	config	     = null;
  
  
  

--
To unsubscribe, e-mail:   <mailto:tomcat-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>


Mime
View raw message