From 6e9a877e0744fae250e5f4ea3b184c4d2afb4499 Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 5 Apr 2011 17:46:21 +0000
Subject: [PATCH] NIHVIVO-1461 Log specific error messages to distinguish
 template parse exception from template not found exception.

---
 .../freemarker/TemplateProcessingHelper.java           | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java
index 29bbf76d1..cdde95e48 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/TemplateProcessingHelper.java
@@ -89,7 +89,15 @@ public class TemplateProcessingHelper {
         try {
             template = config.getTemplate(templateName);
         } catch (IOException e) {
-            throw new TemplateProcessingException("Cannot find template " + templateName);
+            String msg;
+            if (e instanceof freemarker.core.ParseException) {
+                msg = "Syntax error in template " + templateName;
+            } else if (e instanceof java.io.FileNotFoundException) {
+                msg = "Cannot find template " + templateName;                  
+            } else {
+                msg = "IOException getting template " + templateName;
+            }
+            throw new TemplateProcessingException(msg);
         }  
         return template;
     }