This is an automated email from the ASF dual-hosted git repository. amashchenko pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/struts.git
commit 9fd8d6fa8019e7a15ee3dfb9fba17aca36ff0b20 Author: Aleksandr Mashchenko <amashche...@apache.org> AuthorDate: Thu Nov 1 22:05:47 2018 +0200 WW-4971 Use response encoding for include by default --- core/src/main/java/org/apache/struts2/components/Include.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/core/src/main/java/org/apache/struts2/components/Include.java b/core/src/main/java/org/apache/struts2/components/Include.java index 616aa18..70692bf 100644 --- a/core/src/main/java/org/apache/struts2/components/Include.java +++ b/core/src/main/java/org/apache/struts2/components/Include.java @@ -98,13 +98,12 @@ public class Include extends Component { private HttpServletRequest req; private HttpServletResponse res; private String defaultEncoding; // Made non-static (during WW-4971 fix) - private boolean useResponseEncoding; // Added with WW-4971 fix (allows switch between usage of response or default encoding) + private boolean useResponseEncoding = true; // Added with WW-4971 fix (allows switch between usage of response or default encoding) public Include(ValueStack stack, HttpServletRequest req, HttpServletResponse res) { super(stack); this.req = req; this.res = res; - useResponseEncoding = false; // By default use defaultEncoding (vs. response/page encoding) } @Inject(StrutsConstants.STRUTS_I18N_ENCODING)