commit 2306f5f7fad7f0157f216f34331238feb0539fa6
author Lukasz Lenart <lukaszlenart@apache.org> Sat Aug 26 14:26:20 2017 +0200
committer Lukasz Lenart <lukaszlenart@apache.org> Sat Aug 26 14:26:20 2017 +0200
tree 4942f4fedd57ea1e724db65ea0116c1d1eb93ab7
parent ed7f9dd4cb24779813653fbefdd54d89f11a6051

Uses better class resolver logic

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 8285821..b24d857 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
@@ -34,6 +34,7 @@
 import freemarker.cache.MultiTemplateLoader;
 import freemarker.cache.TemplateLoader;
 import freemarker.cache.WebappTemplateLoader;
+import freemarker.core.TemplateClassResolver;
 import freemarker.ext.jsp.TaglibFactory;
 import freemarker.ext.servlet.HttpRequestHashModel;
 import freemarker.ext.servlet.HttpRequestParametersHashModel;
@@ -344,6 +345,9 @@
         configuration.setLocalizedLookup(false);
         configuration.setWhitespaceStripping(true);
 
+        LOG.debug("Sets NewBuiltinClassResolver to TemplateClassResolver.SAFER_RESOLVER");
+        configuration.setNewBuiltinClassResolver(TemplateClassResolver.SAFER_RESOLVER);
+
         return configuration;
     }