From 73b1b12665aa533e079761ceee9c3235614b7be7 Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Fri, 29 Apr 2016 21:03:41 +0100 Subject: [PATCH] [VIVO-1241] Updated FreemarkerConfigurationImpl to override the correct getTemplate for Freemarker 2.3.23 --- .../freemarker/config/FreemarkerConfigurationImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java index 7d2c05c9d..d55630ecc 100644 --- a/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java +++ b/api/src/main/java/edu/cornell/mannlib/vitro/webapp/freemarker/config/FreemarkerConfigurationImpl.java @@ -14,6 +14,9 @@ import java.util.Set; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; +import freemarker.core.ParseException; +import freemarker.template.MalformedTemplateNameException; +import freemarker.template.TemplateNotFoundException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -145,9 +148,8 @@ public class FreemarkerConfigurationImpl extends Configuration { * it must call retrieveAndRunDataGetters() for the top-level Template. */ @Override - public Template getTemplate(String name, Locale locale, String encoding, - boolean parse) throws IOException { - Template template = super.getTemplate(name, locale, encoding, parse); + public Template getTemplate(String name, Locale locale, Object customLookupCondition, String encoding, boolean parseAsFTL, boolean ignoreMissing) throws TemplateNotFoundException, MalformedTemplateNameException, ParseException, IOException { + Template template = super.getTemplate(name, locale, customLookupCondition, encoding, parseAsFTL, ignoreMissing); if (template == null) { log.debug("Template '" + name + "' not found for locale '" + locale