Return-Path: Delivered-To: apmail-jakarta-tomcat-dev-archive@apache.org Received: (qmail 5998 invoked from network); 24 Jan 2002 16:52:28 -0000 Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131) by daedalus.apache.org with SMTP; 24 Jan 2002 16:52:28 -0000 Received: (qmail 15982 invoked by uid 97); 24 Jan 2002 16:48:03 -0000 Delivered-To: qmlist-jakarta-archive-tomcat-dev@jakarta.apache.org Received: (qmail 15949 invoked by uid 97); 24 Jan 2002 16:48:03 -0000 Mailing-List: contact tomcat-dev-help@jakarta.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "Tomcat Developers List" Reply-To: "Tomcat Developers List" Delivered-To: mailing list tomcat-dev@jakarta.apache.org Received: (qmail 15897 invoked by uid 97); 24 Jan 2002 16:48:02 -0000 Date: 24 Jan 2002 16:47:59 -0000 Message-ID: <20020124164759.10017.qmail@icarus.apache.org> From: remm@apache.org To: jakarta-tomcat-4.0-cvs@apache.org Subject: cvs commit: jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves ErrorReportValve.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N remm 02/01/24 08:47:58 Modified: catalina/src/share/org/apache/catalina/valves ErrorReportValve.java Log: - Don't set content-type when the reporter is null. - Fixes bug 5740. Revision Changes Path 1.9 +16 -11 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.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- ErrorReportValve.java 21 Dec 2001 21:15:45 -0000 1.8 +++ ErrorReportValve.java 24 Jan 2002 16:47:58 -0000 1.9 @@ -1,7 +1,7 @@ /* - * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v 1.8 2001/12/21 21:15:45 craigmcc Exp $ - * $Revision: 1.8 $ - * $Date: 2001/12/21 21:15:45 $ + * $Header: /home/cvs/jakarta-tomcat-4.0/catalina/src/share/org/apache/catalina/valves/ErrorReportValve.java,v 1.9 2002/01/24 16:47:58 remm Exp $ + * $Revision: 1.9 $ + * $Date: 2002/01/24 16:47:58 $ * * ==================================================================== * @@ -105,7 +105,7 @@ * @author Craig R. McClanahan * @author Nicola Ken Barozzi Aisa * @author Stefano Mazzocchi - * @version $Revision: 1.8 $ $Date: 2001/12/21 21:15:45 $ + * @version $Revision: 1.9 $ $Date: 2002/01/24 16:47:58 $ */ public class ErrorReportValve @@ -291,13 +291,6 @@ if (report == null) return; - try { - hres.setContentType("text/html"); - } catch (Throwable t) { - if (debug >= 1) - log("status.setContentType", t); - } - StringBuffer sb = new StringBuffer(); sb.append(""); @@ -357,13 +350,25 @@ sb.append("</body></html>"); try { + Writer writer = response.getReporter(); + if (writer != null) { + + try { + hres.setContentType("text/html"); + } catch (Throwable t) { + if (debug >= 1) + log("status.setContentType", t); + } + // If writer is null, it's an indication that the response has // been hard committed already, which should never happen writer.write(sb.toString()); writer.flush(); + } + } catch (IOException e) { ; } catch (IllegalStateException e) { -- To unsubscribe, e-mail: <mailto:tomcat-dev-unsubscribe@jakarta.apache.org> For additional commands, e-mail: <mailto:tomcat-dev-help@jakarta.apache.org>