struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [56/56] [abbrv] struts git commit: WW-4391 reverts changes as this breaks WW-4420
Date Mon, 17 Nov 2014 10:48:59 GMT
WW-4391 reverts changes as this breaks WW-4420


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/e1025a20
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/e1025a20
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/e1025a20

Branch: refs/heads/develop
Commit: e1025a207ddfa1b8971ec6261ea2c09da2af157f
Parents: 77c76dc
Author: Lukasz Lenart <lukaszlenart@apache.org>
Authored: Mon Nov 17 11:39:38 2014 +0100
Committer: Lukasz Lenart <lukaszlenart@apache.org>
Committed: Mon Nov 17 11:39:38 2014 +0100

----------------------------------------------------------------------
 .../org/apache/struts2/views/freemarker/FreemarkerResult.java   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/e1025a20/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerResult.java
----------------------------------------------------------------------
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 95e4073..3ded53b 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;


Mime
View raw message