From 9b2e6545453f7c528f8b2e169d23c4244539d300 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Fri, 22 Oct 2010 15:08:09 +0000 Subject: [PATCH] NHVIVO-1218 Correct blank page on image upload error by removing overrides to getTemplateName() and getMap() in ExceptionResponseValues. --- .../freemarker/FreemarkerHttpServlet.java | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java index 82bd82ede..adc488196 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/FreemarkerHttpServlet.java @@ -133,8 +133,9 @@ public class FreemarkerHttpServlet extends VitroHttpServlet { log.debug("Disabling Freemarker template caching in development build."); config.setTemplateUpdateDelay(0); // no template caching in development } else { - log.debug("Setting Freemarker template cache update delay."); - config.setTemplateUpdateDelay(60); // in seconds; Freemarker default is 5 + int delay = 60; + log.debug("Setting Freemarker template cache update delay to " + delay + "."); + config.setTemplateUpdateDelay(delay); // in seconds; Freemarker default is 5 } // Specify how templates will see the data model. @@ -841,17 +842,6 @@ public class FreemarkerHttpServlet extends VitroHttpServlet { return cause; } - @Override - public String getTemplateName() { - throw new UnsupportedOperationException( - "This is not a template response."); - } - - @Override - public Map getMap() { - throw new IllegalStateException("This is not a template response."); - } - @Override public String getRedirectUrl() { throw new UnsupportedOperationException(