From 8263bd9cf1779d75a669c91673960c8a838e4afd Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 22 Oct 2010 15:10:08 +0000
Subject: [PATCH] NHVIVO-1218 Correct blank page on image upload error by
 removing overrides to getTemplateName() and getMap() in
 ExceptionResponseValues.

---
 .../webapp/controller/freemarker/FreemarkerHttpServlet.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 adc488196..fc1c3b17c 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
@@ -317,7 +317,7 @@ public class FreemarkerHttpServlet extends VitroHttpServlet {
     protected void doException(VitroRequest vreq, HttpServletResponse response, ResponseValues values) {
         // Log the error, and display an error message on the page.        
         log.error(values.getException(), values.getException());      
-        TemplateResponseValues trv = new TemplateResponseValues(Template.STANDARD_ERROR.toString());
+        TemplateResponseValues trv = new TemplateResponseValues(values.getTemplateName(), values.getMap());
         doTemplate(vreq, response, trv);
     }