WW-4391 reverts changes as this breaks WW-4420

ZhangLeiStar · Nov 17, 2014 · e1025a2 · e1025a2
1 parent 77c76dc
commit e1025a2
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
@@ -343,10 +343,7 @@ protected boolean preTemplateProcess(Template template, TemplateModel model) thr
                     contentType = "text/html";
                 }
 
-                String encoding = response.getCharacterEncoding();
-                if(encoding == null) {
-                    encoding = template.getEncoding();
-                }
+                String encoding = template.getEncoding();
 
                 if (encoding != null) {
                     contentType = contentType + "; charset=" + encoding;