From 7f6997d65bd2d3c4f25a546656f1a234cc05415d Mon Sep 17 00:00:00 2001 From: Will Abson Date: Wed, 25 Jun 2014 15:58:55 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud) 73350: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud) 73193: Merged DEV to V4.2-BUG-FIX (4.2.3) 73075: MNT-8886 Users with disabled accounts receive email notification from workflow git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74768 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/action/executer/MailActionExecuter.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java index 15bb9086d5..f767622b21 100644 --- a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java +++ b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java @@ -488,8 +488,11 @@ public class MailActionExecuter extends ActionExecuterAbstractBase else { for (MimeMessageHelper message : finalMessages) { + if (message != null) + { sendEmail(ruleAction, message); } + } } } @@ -933,6 +936,7 @@ public class MailActionExecuter extends ActionExecuterAbstractBase { logger.warn("Unable to prepare mail message. Skipping.", e); } + return null; } return messageRef[0];