From a16fd2d13920154a129c81c95f114599085b22a6 Mon Sep 17 00:00:00 2001
From: Roy Wetherall <roy.wetherall@alfresco.com>
Date: Wed, 16 Nov 2011 23:25:10 +0000
Subject: [PATCH] ALF-11108: Notification when item is updated, even though
 'when' states 'items are created or enter this folder'

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32039 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/action/executer/MailActionExecuter.java      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
index 9d9ce2b123..686f7040aa 100644
--- a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
+++ b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
@@ -316,7 +316,11 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
                         @Override
                         public Void execute() throws Throwable
                         {
-                            prepareAndSendEmail(ruleAction, actionedUponNodeRef);  
+                            // Only try and send the email if the actioned upon node reference still exists
+                            if (nodeService.exists(actionedUponNodeRef) == true)
+                            {
+                                prepareAndSendEmail(ruleAction, actionedUponNodeRef);
+                            }
                             return null;
                         }
                     }, false, true);          
@@ -325,7 +329,10 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
         }
         else
         {
-            prepareAndSendEmail(ruleAction, actionedUponNodeRef);            
+            if (nodeService.exists(actionedUponNodeRef) == true)
+            {
+                prepareAndSendEmail(ruleAction, actionedUponNodeRef);
+            }
         }
     }