From 509dcac570e98f2658547707e3f04bf4e78b4ff4 Mon Sep 17 00:00:00 2001 From: markt Date: Sat, 7 Mar 2009 19:42:09 +0000 Subject: [PATCH] Allow the AddDefaultCharsetValve to be effective when a writer is used git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@751313 13f79535-47bb-0310-9956-ffa450edef68 --- java/org/apache/catalina/connector/Response.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/java/org/apache/catalina/connector/Response.java b/java/org/apache/catalina/connector/Response.java index 349b49d7c..d99a399c5 100644 --- a/java/org/apache/catalina/connector/Response.java +++ b/java/org/apache/catalina/connector/Response.java @@ -811,9 +811,11 @@ public class Response if (included) return; - // Ignore any call made after the getWriter has been invoked - // The default should be used - if (usingWriter) + // 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))) return; coyoteResponse.setCharacterEncoding(charset); -- 2.11.0