Repository: incubator-unomi Updated Branches: refs/heads/master b38d44c8d -> 18af860b5
UNOMI-99 Improve network unavailable and connection timeout handling - Force mail template delimiters to $ instead of < > Signed-off-by: Serge Huber <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/18af860b Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/18af860b Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/18af860b Branch: refs/heads/master Commit: 18af860b5618d6452905bcca118d8f2a40c8573c Parents: b38d44c Author: Serge Huber <[email protected]> Authored: Fri Jun 16 16:47:43 2017 +0200 Committer: Serge Huber <[email protected]> Committed: Fri Jun 16 16:47:43 2017 +0200 ---------------------------------------------------------------------- .../java/org/apache/unomi/plugins/mail/actions/SendMailAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/18af860b/plugins/mail/src/main/java/org/apache/unomi/plugins/mail/actions/SendMailAction.java ---------------------------------------------------------------------- diff --git a/plugins/mail/src/main/java/org/apache/unomi/plugins/mail/actions/SendMailAction.java b/plugins/mail/src/main/java/org/apache/unomi/plugins/mail/actions/SendMailAction.java index 8810bbc..9e1aadb 100644 --- a/plugins/mail/src/main/java/org/apache/unomi/plugins/mail/actions/SendMailAction.java +++ b/plugins/mail/src/main/java/org/apache/unomi/plugins/mail/actions/SendMailAction.java @@ -115,7 +115,7 @@ public class SendMailAction implements ActionExecutor { event.getProfile().getSystemProperties().put("notificationAck", profileNotif); persistenceService.update(event.getProfile().getItemId(), null, Profile.class, "systemProperties", event.getProfile().getSystemProperties()); - ST stringTemplate = new ST(template); + ST stringTemplate = new ST(template, '$', '$'); stringTemplate.add("profile", event.getProfile()); stringTemplate.add("event", event); // load your HTML email template
