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

ALF-11625: Exception occurs on server startup relating to FeedNotifier

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32492 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2011-12-02 19:02:50 +00:00
parent bae80cd121
commit b2b10ac521
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -316,8 +316,7 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
@Override @Override
public Void execute() throws Throwable public Void execute() throws Throwable
{ {
// Only try and send the email if the actioned upon node reference still exists if (validNodeRefIfPresent(actionedUponNodeRef))
if (nodeService.exists(actionedUponNodeRef) == true)
{ {
prepareAndSendEmail(ruleAction, actionedUponNodeRef); prepareAndSendEmail(ruleAction, actionedUponNodeRef);
} }
@@ -329,13 +328,30 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
} }
else else
{ {
if (nodeService.exists(actionedUponNodeRef) == true) if (validNodeRefIfPresent(actionedUponNodeRef))
{ {
prepareAndSendEmail(ruleAction, actionedUponNodeRef); prepareAndSendEmail(ruleAction, actionedUponNodeRef);
} }
} }
} }
private boolean validNodeRefIfPresent(NodeRef actionedUponNodeRef)
{
if (actionedUponNodeRef == null)
{
// We must expect that null might be passed in (ALF-11625)
// since the mail action might not relate to a specific nodeRef.
return true;
}
else
{
// Only try and send the email if the actioned upon node reference still exists
// (i.e. if one has been specified it must be valid)
return nodeService.exists(actionedUponNodeRef);
}
}
private boolean sendAfterCommit(Action action) private boolean sendAfterCommit(Action action)
{ {
Boolean sendAfterCommit = (Boolean) action.getParameterValue(PARAM_SEND_AFTER_COMMIT); Boolean sendAfterCommit = (Boolean) action.getParameterValue(PARAM_SEND_AFTER_COMMIT);