You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by co...@locus.apache.org on 2000/06/26 23:59:33 UTC
cvs commit: jakarta-tomcat/src/share/org/apache/tomcat/core ContextManager.java ResponseImpl.java
costin 00/06/26 14:59:33
Modified: src/share/org/apache/tomcat/core ContextManager.java
ResponseImpl.java
Log:
Fix bug in ResponseImpl - getWriter will set usingWriter=true
Revision Changes Path
1.97 +1 -1 jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java
Index: ContextManager.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ContextManager.java,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- ContextManager.java 2000/06/22 23:33:11 1.96
+++ ContextManager.java 2000/06/26 21:59:30 1.97
@@ -663,7 +663,7 @@
*/
public void service( Request req, Response res ) {
internalService( req, res );
- // clean up
+ // clean up
try {
res.finish();
req.recycle();
1.32 +5 -4 jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java
Index: ResponseImpl.java
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ResponseImpl.java 2000/06/22 19:49:36 1.31
+++ ResponseImpl.java 2000/06/26 21:59:30 1.32
@@ -1,7 +1,7 @@
/*
- * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java,v 1.31 2000/06/22 19:49:36 costin Exp $
- * $Revision: 1.31 $
- * $Date: 2000/06/22 19:49:36 $
+ * $Header: /home/cvs/jakarta-tomcat/src/share/org/apache/tomcat/core/ResponseImpl.java,v 1.32 2000/06/26 21:59:30 costin Exp $
+ * $Revision: 1.32 $
+ * $Date: 2000/06/26 21:59:30 $
*
* ====================================================================
*
@@ -192,6 +192,7 @@
request.getContextManager().doAfterBody(request, this);
return;
}
+ out.flush();
out.reallyFlush();
request.getContextManager().doAfterBody(request, this);
out.close();
@@ -230,7 +231,7 @@
// it already did all the checkings
started = true;
-
+ usingWriter = true;
writer = new ServletWriterFacade( getConverter(outs), this);
return writer;