remm 01/10/02 19:02:05
Modified: catalina/src/share/org/apache/catalina/valves
ErrorReportValve.java
Log:
- The reporter can be null if it would be illegal to write any additional data.
Revision Changes Path
1.5 +10 -6
jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java
Index: ErrorReportValve.java
===================================================================
RCS file:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ErrorReportValve.java 2001/09/28 16:59:22 1.4
+++ ErrorReportValve.java 2001/10/03 02:02:05 1.5
@@ -1,7 +1,7 @@
/*
- * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
1.4 2001/09/28 16:59:22 remm Exp $
- * $Revision: 1.4 $
- * $Date: 2001/09/28 16:59:22 $
+ * $Header:
/home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v
1.5 2001/10/03 02:02:05 remm Exp $
+ * $Revision: 1.5 $
+ * $Date: 2001/10/03 02:02:05 $
*
* ====================================================================
*
@@ -104,7 +104,7 @@
* @author Craig R. McClanahan
* @author <a href="mailto:[EMAIL PROTECTED]";>Nicola Ken Barozzi</a> Aisa
* @author <a href="mailto:[EMAIL PROTECTED]";>Stefano Mazzocchi</a>
- * @version $Revision: 1.4 $ $Date: 2001/09/28 16:59:22 $
+ * @version $Revision: 1.5 $ $Date: 2001/10/03 02:02:05 $
*/
public class ErrorReportValve
@@ -353,8 +353,12 @@
try {
Writer writer = response.getReporter();
- writer.write(sb.toString());
- writer.flush();
+ if (writer != null) {
+ // If writer is null, it's an indication that the response has
+ // been hard committed already
+ writer.write(sb.toString());
+ writer.flush();
+ }
} catch (IOException e) {
;
} catch (IllegalStateException e) {
