hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 18:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

[DS-3952] Log Velocity errors.

Browse Source
This commit is contained in:
Mark H. Wood
2021-10-01 14:17:51 -04:00
parent 8cbdc100df
commit 7e6326619d
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dspace-api/src/main/java/org/dspace/core/Email.java
View File

@@ -48,6 +48,9 @@ import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext; import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity; import org.apache.velocity.app.Velocity;
import org.apache.velocity.app.VelocityEngine; import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.exception.MethodInvocationException;
import org.apache.velocity.exception.ParseErrorException;
import org.apache.velocity.exception.ResourceNotFoundException;
import org.apache.velocity.runtime.resource.loader.StringResourceLoader; import org.apache.velocity.runtime.resource.loader.StringResourceLoader;
import org.apache.velocity.runtime.resource.util.StringResourceRepository; import org.apache.velocity.runtime.resource.util.StringResourceRepository;
import org.dspace.services.ConfigurationService; import org.dspace.services.ConfigurationService;
@@ -334,7 +337,13 @@ public class Email {
} }
StringWriter writer = new StringWriter(); StringWriter writer = new StringWriter();
template.merge(vctx, writer); try {
template.merge(vctx, writer);
} catch (MethodInvocationException | ParseErrorException
| ResourceNotFoundException ex) {
LOG.error("Template not merged: {}", ex.getMessage());
throw new MessagingException("Template not merged", ex);
}
String fullMessage = writer.toString(); String fullMessage = writer.toString();
// Set some message header fields // Set some message header fields