remm 01/12/11 00:26:17
Modified: catalina/src/share/org/apache/catalina/core
ApplicationDispatcher.java
Log:
- Modify a bit latest patch, since here the flush should be in its own try/catch.
Revision Changes Path
1.29 +8 -4
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java
Index: ApplicationDispatcher.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ApplicationDispatcher.java 2001/12/11 08:11:09 1.28
+++ ApplicationDispatcher.java 2001/12/11 08:26:16 1.29
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
1.28 2001/12/11 08:11:09 remm Exp $
- * $Revision: 1.28 $
- * $Date: 2001/12/11 08:11:09 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
1.29 2001/12/11 08:26:16 remm Exp $
+ * $Revision: 1.29 $
+ * $Date: 2001/12/11 08:26:16 $
*
* ====================================================================
*
@@ -109,7 +109,7 @@
* <code>javax.servlet.ServletResponseWrapper</code>.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.28 $ $Date: 2001/12/11 08:11:09 $
+ * @version $Revision: 1.29 $ $Date: 2001/12/11 08:26:16 $
*/
final class ApplicationDispatcher
@@ -443,6 +443,10 @@
// Close anyway
try {
response.flushBuffer();
+ } catch (IllegalStateException f) {
+ ;
+ }
+ try {
PrintWriter writer = response.getWriter();
writer.flush();
writer.close();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
