From 1ecf65c76b7a66d155505a1e2a0716c7baf34ec3 Mon Sep 17 00:00:00 2001
From: Mark Hibbins <mark.hibbins@alfresco.com>
Date: Wed, 18 Jun 2014 15:32:48 +0000
Subject: [PATCH] RM-1537, rules on root node now not executed on items being
 added to hold

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@74167 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../module/org_alfresco_module_rm/hold/HoldServiceImpl.java | 6 +++---
 .../org/alfresco/repo/rule/ExtendedRuleServiceImpl.java     | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java
index b890e52bef..226f2224c5 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/hold/HoldServiceImpl.java
@@ -535,9 +535,6 @@ public class HoldServiceImpl extends ServiceBaseImpl
                     @Override
                     public Void doWork()
                     {
-                        // Link the record to the hold
-                        nodeService.addChild(hold, nodeRef, ASSOC_FROZEN_RECORDS, ASSOC_FROZEN_RECORDS);
-
                         // gather freeze properties
                         Map<QName, Serializable> props = new HashMap<QName, Serializable>(2);
                         props.put(PROP_FROZEN_AT, new Date());
@@ -556,6 +553,9 @@ public class HoldServiceImpl extends ServiceBaseImpl
                             }
                         }
 
+                        // Link the record to the hold
+                        nodeService.addChild(hold, nodeRef, ASSOC_FROZEN_RECORDS, ASSOC_FROZEN_RECORDS);
+
                         // Mark all the folders contents as frozen
                         if (isRecordFolder(nodeRef))
                         {
diff --git a/rm-server/source/java/org/alfresco/repo/rule/ExtendedRuleServiceImpl.java b/rm-server/source/java/org/alfresco/repo/rule/ExtendedRuleServiceImpl.java
index 20ee4b2868..8297e8ee56 100644
--- a/rm-server/source/java/org/alfresco/repo/rule/ExtendedRuleServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/repo/rule/ExtendedRuleServiceImpl.java
@@ -242,6 +242,7 @@ public class ExtendedRuleServiceImpl extends RuleServiceImpl
                        RecordsManagementModel.TYPE_UNFILED_RECORD_CONTAINER.equals(typeQName) ||
                        RecordsManagementModel.TYPE_UNFILED_RECORD_FOLDER.equals(typeQName) ||
                        nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_TRANSFERRING) ||
+                       nodeService.hasAspect(nodeRef, RecordsManagementModel.ASPECT_FROZEN) ||
                        (ContentModel.TYPE_CONTENT.equals(typeQName) && !recordService.isFiled(nodeRef)));
         }
         return result;