Return-Path: X-Original-To: apmail-struts-commits-archive@minotaur.apache.org Delivered-To: apmail-struts-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 52212C2E9 for ; Mon, 17 Nov 2014 10:48:36 +0000 (UTC) Received: (qmail 30658 invoked by uid 500); 17 Nov 2014 10:48:07 -0000 Delivered-To: apmail-struts-commits-archive@struts.apache.org Received: (qmail 30589 invoked by uid 500); 17 Nov 2014 10:48:07 -0000 Mailing-List: contact commits-help@struts.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@struts.apache.org Delivered-To: mailing list commits@struts.apache.org Received: (qmail 29366 invoked by uid 99); 17 Nov 2014 10:48:06 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 17 Nov 2014 10:48:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 0D9E793D9CF; Mon, 17 Nov 2014 10:48:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: lukaszlenart@apache.org To: commits@struts.apache.org Date: Mon, 17 Nov 2014 10:48:59 -0000 Message-Id: <43b959106ccb481b9127b97562f96e8b@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [56/56] [abbrv] struts git commit: WW-4391 reverts changes as this breaks WW-4420 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 Authored: Mon Nov 17 11:39:38 2014 +0100 Committer: Lukasz Lenart 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;