remm 01/12/11 00:29:00
Modified: catalina/src/share/org/apache/catalina/core Tag:
tomcat_40_branch ApplicationDispatcher.java
Log:
- Make code more robust. Fixes a tester failure.
Revision Changes Path
No revision
No revision
1.25.2.3 +9 -5
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.25.2.2
retrieving revision 1.25.2.3
diff -u -r1.25.2.2 -r1.25.2.3
--- ApplicationDispatcher.java 2001/11/03 02:10:56 1.25.2.2
+++ ApplicationDispatcher.java 2001/12/11 08:29:00 1.25.2.3
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
1.25.2.2 2001/11/03 02:10:56 remm Exp $
- * $Revision: 1.25.2.2 $
- * $Date: 2001/11/03 02:10:56 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/core/ApplicationDispatcher.java,v
1.25.2.3 2001/12/11 08:29:00 remm Exp $
+ * $Revision: 1.25.2.3 $
+ * $Date: 2001/12/11 08:29:00 $
*
* ====================================================================
*
@@ -109,7 +109,7 @@
* <code>javax.servlet.ServletResponseWrapper</code>.
*
* @author Craig R. McClanahan
- * @version $Revision: 1.25.2.2 $ $Date: 2001/11/03 02:10:56 $
+ * @version $Revision: 1.25.2.3 $ $Date: 2001/12/11 08:29:00 $
*/
final class ApplicationDispatcher
@@ -441,7 +441,11 @@
((ResponseFacade) response).finish();
} else {
// Close anyway
- response.flushBuffer();
+ try {
+ response.flushBuffer();
+ } catch (IllegalStateException f) {
+ ;
+ }
try {
PrintWriter writer = response.getWriter();
writer.flush();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
