Repository: struts Updated Branches: refs/heads/support-2-3 997966829 -> c6750c110
Solves issue with warning abut Custom EL Project: http://git-wip-us.apache.org/repos/asf/struts/repo Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/c6750c11 Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/c6750c11 Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/c6750c11 Branch: refs/heads/support-2-3 Commit: c6750c110ca07719ef2b3d706b927e3195ff01c8 Parents: 9979668 Author: Lukasz Lenart <lukaszlen...@apache.org> Authored: Sun Jan 10 16:05:20 2016 +0100 Committer: Lukasz Lenart <lukaszlen...@apache.org> Committed: Sun Jan 10 16:05:20 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/struts2/views/freemarker/FreemarkerManager.java | 1 + 1 file changed, 1 insertion(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/struts/blob/c6750c11/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java index a99235e..8285821 100644 --- a/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java +++ b/core/src/main/java/org/apache/struts2/views/freemarker/FreemarkerManager.java @@ -365,6 +365,7 @@ public class FreemarkerManager { servletContext.setAttribute(ATTR_APPLICATION_MODEL, servletContextModel); } TaglibFactory taglibs = new TaglibFactory(servletContext); + taglibs.setObjectWrapper(wrapper); servletContext.setAttribute(ATTR_JSP_TAGLIBS_MODEL, taglibs); } model.put(KEY_APPLICATION, servletContextModel);
