opendev/gerrit
Code Issues Proposed changes

Merge "Avoid error log from velocity if no custom e-mail template exists"

Browse Source
This commit is contained in:
Martin Fick
2011-11-07 14:15:37 -08:00
committed by gerrit code review
parent b07482770b 60c7cdf710
commit 6d26d9b148
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gerrit-server/src/main/java/com/google/gerrit/server/mail/OutgoingEmail.java
View File

@@ -374,13 +374,10 @@ public abstract class OutgoingEmail {
protected String velocifyFile(String name) throws EmailException { protected String velocifyFile(String name) throws EmailException {
try { try {
RuntimeInstance runtime = args.velocityRuntime; RuntimeInstance runtime = args.velocityRuntime;
Template template; if (runtime.getLoaderNameForResource(name) == null) {
try {
template = runtime.getTemplate(name, "UTF-8");
} catch (org.apache.velocity.exception.ResourceNotFoundException notFound) {
name = "com/google/gerrit/server/mail/" + name; name = "com/google/gerrit/server/mail/" + name;
template = runtime.getTemplate(name, "UTF-8");
} }
Template template = runtime.getTemplate(name, "UTF-8");
StringWriter w = new StringWriter(); StringWriter w = new StringWriter();
template.merge(velocityContext, w); template.merge(velocityContext, w);
return w.toString(); return w.toString();