struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [23/50] [abbrv] struts git commit: Ports solution to resolve problem with EL functions
Date Fri, 15 Jul 2016 13:18:50 GMT
Ports solution to resolve problem with EL functions


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

Branch: refs/heads/master
Commit: 8d83dc2f964a7af332df16b63a1380db5a26ced0
Parents: 4e3f950
Author: Lukasz Lenart <lukasz.lenart@gmail.com>
Authored: Tue Jan 12 08:51:34 2016 +0100
Committer: Lukasz Lenart <lukasz.lenart@gmail.com>
Committed: Tue Jan 19 16:18:42 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/8d83dc2f/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 ddc7669..3323302 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
@@ -350,6 +350,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);


Mime
View raw message