From 9c7ee3acd25b45509c4f8fad5d35e77b96d7256d Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Mon, 19 Dec 2016 18:45:17 +0000
Subject: [PATCH] Added a check to see if the aspect hasn't been removed in the
 same transaction.

---
 .../model/rma/aspect/FilePlanComponentAspect.java              | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
index 5a9b7f0ce4..93d241389b 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/model/rma/aspect/FilePlanComponentAspect.java
@@ -203,7 +203,8 @@ public class FilePlanComponentAspect extends    BaseBehaviourBean
             @Override
             public Void doWork()
             {
-                if (nodeService.exists(nodeRef))
+                // Check if the node exists and the aspect hasn't been removed in the same transaction (see RM-3266)
+                if (nodeService.exists(nodeRef) && nodeService.hasAspect(nodeRef, aspectTypeQName))
                 {
                     // Look up the root and set on the aspect if found
                     NodeRef root = filePlanService.getFilePlan(nodeRef);