From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 7 Mar 2009 19:42:09 +0000 (+0000)
Subject: Allow the AddDefaultCharsetValve to be effective when a writer is used
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=509dcac570e98f2658547707e3f04bf4e78b4ff4;p=tomcat7.0

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
---

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);