From 986919d47950b01bdd8be84110c5864d1a8ce83a Mon Sep 17 00:00:00 2001
From: Roy Wetherall <roy.wetherall@alfresco.com>
Date: Fri, 19 Dec 2014 01:42:44 +0000
Subject: [PATCH] Merged DEV to HEAD:

   92563: RM-1636 : Disposition steps can be executed for folder with frozen record



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@92588 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../disposition/DispositionServiceImpl.java                   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
index 3883e7a097..c302937ae1 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/disposition/DispositionServiceImpl.java
@@ -1004,6 +1004,10 @@ public class DispositionServiceImpl extends    ServiceBaseImpl
                     recordFolderService.closeRecordFolder(nodeRef);
                 }
             }
+            else
+            {
+                throw new AlfrescoRuntimeException("unable to perform cutoff, because node is frozen or has frozen children");
+            }
         }
         else
         {