From d7f7155f1b2fa40ec0661960bda9d3cdaa7f1806 Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 17 Jun 2011 13:59:25 +0000
Subject: [PATCH] NIHVIVO-2693 Minor refactoring in
 FreemarkerEmailMessage.processTemplate(): don't need to create an Environment
 object to process the template, because we no longer need to add the request
 object as a custom attribute of the Environment. Just call Template.process()
 instead.

---
 .../mannlib/vitro/webapp/email/FreemarkerEmailMessage.java   | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java
index 906c46dea..d980dd8d7 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/email/FreemarkerEmailMessage.java
@@ -160,10 +160,7 @@ public class FreemarkerEmailMessage {
 
 		try {
 			Template template = config.getTemplate(templateName);
-			Environment env = template.createProcessingEnvironment(bodyMap,
-					new StringWriter());
-			env.setCustomAttribute("request", req);
-			env.process();
+			template.process(bodyMap, new StringWriter());
 		} catch (TemplateException e) {
 			log.error(e, e);
 		} catch (IOException e) {