UNDERTOW-550 Clear charsetSet if the charset is null

undertow-io · Sep 29, 2015 · 549ea17 · 549ea17
1 parent 95051a8
commit 549ea17
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/servlet/src/main/java/io/undertow/servlet/spec/HttpServletResponseImpl.java b/servlet/src/main/java/io/undertow/servlet/spec/HttpServletResponseImpl.java
@@ -372,7 +372,7 @@ public void setCharacterEncoding(final String charset) {
         if (insideInclude || responseStarted() || writer != null || isCommitted()) {
             return;
         }
-        charsetSet = true;
+        charsetSet = charset != null;
         this.charset = charset;
         if (contentType != null) {
             exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, getContentType());