inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)

Browse Source 
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
This commit is contained in:
Will Abson
2014-06-25 15:58:55 +00:00
parent 1fbd9447a8
commit 7f6997d65b
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
View File

@@ -488,10 +488,13 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
else else
{ {
for (MimeMessageHelper message : finalMessages) { for (MimeMessageHelper message : finalMessages) {
if (message != null)
{
sendEmail(ruleAction, message); sendEmail(ruleAction, message);
} }
} }
} }
}
} }
@@ -933,6 +936,7 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
{ {
logger.warn("Unable to prepare mail message. Skipping.", e); logger.warn("Unable to prepare mail message. Skipping.", e);
} }
return null;
} }
return messageRef[0]; return messageRef[0];