From 70ceb1d97cefd63b3d8437434c4bda7450cfcadb Mon Sep 17 00:00:00 2001 From: markt Date: Sun, 8 Mar 2009 09:40:22 +0000 Subject: [PATCH] Revert previous commit. Plan to rework valve so this hack isn't required git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@751392 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/connector/Response.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/java/org/apache/catalina/connector/Response.java b/java/org/apache/catalina/connector/Response.java index d99a399c5..349b49d7c 100644 --- a/java/org/apache/catalina/connector/Response.java +++ b/java/org/apache/catalina/connector/Response.java @@ -811,11 +811,9 @@ public class Response if (included) return; - // Normally calls to this method after the getWriter has been invoked - // will be ignored. The exception allows the addDefaultCharsetValve to - // insert the default charset in appropriate circumstances - if (usingWriter && (isCharacterEncodingSet || - !getCharacterEncoding().equalsIgnoreCase(charset))) + // Ignore any call made after the getWriter has been invoked + // The default should be used + if (usingWriter) return; coyoteResponse.setCharacterEncoding(charset); -- 2.11.0