From e1025a207ddfa1b8971ec6261ea2c09da2af157f Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Mon, 17 Nov 2014 11:39:38 +0100
Subject: [PATCH] WW-4391 reverts changes as this breaks WW-4420

---
 .../apache/struts2/views/freemarker/FreemarkerResult.java    | 5 +----
 1 file changed, 1 insertion(+), 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
index 95e40733a..3ded53ba3 100644
--- 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 @@ public class FreemarkerResult extends StrutsResultSupport {
                     contentType = "text/html";
                 }
 
-                String encoding = response.getCharacterEncoding();
-                if(encoding == null) {
-                    encoding = template.getEncoding();
-                }
+                String encoding = template.getEncoding();
 
                 if (encoding != null) {
                     contentType = contentType + "; charset=" + encoding;