From 4ee3384c370190f2398cdd30aa863e24f7944f02 Mon Sep 17 00:00:00 2001
From: Neil McErlean <neil.mcerlean@alfresco.com>
Date: Thu, 26 Apr 2012 09:27:53 +0000
Subject: [PATCH] Merged BRANCHES/DEV/V4.0-BUG-FIX to HEAD:    35751: Addendum
 to fix for ALF-11923. Fixing failing test case by tightening up delete
 behaviour.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@35753 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/web/scripts/rule/RuleServiceTest.java     | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/source/java/org/alfresco/repo/web/scripts/rule/RuleServiceTest.java b/source/java/org/alfresco/repo/web/scripts/rule/RuleServiceTest.java
index eedb93ffec..fe9912fe63 100644
--- a/source/java/org/alfresco/repo/web/scripts/rule/RuleServiceTest.java
+++ b/source/java/org/alfresco/repo/web/scripts/rule/RuleServiceTest.java
@@ -162,11 +162,19 @@ public class RuleServiceTest extends BaseWebScriptTest
             @Override
             public Void execute() throws Throwable
             {
-                nodeService.deleteNode(testNodeRef2);
-                nodeService.deleteNode(testNodeRef);
-                nodeService.deleteNode(testWorkNodeRef);
+                deleteNodeIfExists(testNodeRef2);
+                deleteNodeIfExists(testNodeRef);
+                deleteNodeIfExists(testWorkNodeRef);
                 return null;
             }
+            
+            private void deleteNodeIfExists(NodeRef nodeRef)
+            {
+                if (nodeService.exists(nodeRef))
+                {
+                    nodeService.deleteNode(nodeRef);
+                }
+            }
         };
         this.transactionService.getRetryingTransactionHelper().doInTransaction(deleteCallback);
         this.authenticationComponent.clearCurrentSecurityContext();