Author: markt
Date: Sun Mar 8 09:40:22 2009
New Revision: 751392
URL: http://svn.apache.org/viewvc?rev=751392&view=rev
Log:
Revert previous commit. Plan to rework valve so this hack isn't required
Modified:
tomcat/trunk/java/org/apache/catalina/connector/Response.java
Modified: tomcat/trunk/java/org/apache/catalina/connector/Response.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/connector/Response.java?rev=751392&r1=751391&r2=751392&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/connector/Response.java (original)
+++ tomcat/trunk/java/org/apache/catalina/connector/Response.java Sun Mar 8
09:40:22 2009
@@ -811,11 +811,9 @@
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);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
