From 1a034053bcf82ce05fe21680ca658ddae03bb159 Mon Sep 17 00:00:00 2001
From: Lukasz Lenart <lukaszlenart@apache.org>
Date: Thu, 21 Aug 2014 20:58:10 +0200
Subject: [PATCH] WW-4391 FreemarkerResult uses response content encoding in
 first place

---
 .../apache/struts2/views/freemarker/FreemarkerResult.java    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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 3ded53ba3..95e40733a 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,7 +343,10 @@ public class FreemarkerResult extends StrutsResultSupport {
                     contentType = "text/html";
                 }
 
-                String encoding = template.getEncoding();
+                String encoding = response.getCharacterEncoding();
+                if(encoding == null) {
+                    encoding = template.getEncoding();
+                }
 
                 if (encoding != null) {
                     contentType = contentType + "; charset=" + encoding;