Fix missing validation for templates

hawkular · Aug 19, 2015 · 619e700 · 619e700
1 parent ef4cff3
commit 619e700
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/...r-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/EmailTemplate.java b/...r-alerts-actions-email/src/main/java/org/hawkular/alerts/actions/email/EmailTemplate.java
@@ -141,13 +141,13 @@ public Map<String, String> body(Map<String, String> props, Alert alert) throws E
 
             StringWriter writerPlain = new StringWriter();
             StringWriter writerHtml = new StringWriter();
-            if (plain != null) {
+            if (plain != null && !plain.isEmpty()) {
                 ftlTemplate = Template.getPlainTextTemplate("plainTemplate", plain, ftlCfg);
                 ftlTemplate.process(templateData, writerPlain);
             }  else {
                 ftlTemplatePlain.process(templateData, writerPlain);
             }
-            if (html != null) {
+            if (html != null && !html.isEmpty()) {
                 ftlTemplate = Template.getPlainTextTemplate("htmlTemplate", html, ftlCfg);
                 ftlTemplate.process(templateData, writerHtml);
             } else {