From b5903874b43aaa6671beb1176a468cd8efaaae7d Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Fri, 6 Sep 2013 02:22:28 +0000 Subject: [PATCH] RM-689: Unclear work of outbound (delete) rules * ensure freeze doesn't fire if delete pending git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@55003 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org_alfresco_module_rm/action/impl/FreezeAction.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FreezeAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FreezeAction.java index 7f8f31adc1..a5a9b4b8b3 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FreezeAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/FreezeAction.java @@ -20,6 +20,7 @@ package org.alfresco.module.org_alfresco_module_rm.action.impl; import java.util.List; +import org.alfresco.model.ContentModel; import org.alfresco.module.org_alfresco_module_rm.action.RMActionExecuterAbstractBase; import org.alfresco.repo.action.ParameterDefinitionImpl; import org.alfresco.service.cmr.action.Action; @@ -53,8 +54,10 @@ public class FreezeAction extends RMActionExecuterAbstractBase protected void executeImpl(Action action, NodeRef actionedUponNodeRef) { // NOTE: we can only freeze records and record folders so ignore everything else - if (recordService.isRecord(actionedUponNodeRef) == true || - recordsManagementService.isRecordFolder(actionedUponNodeRef) == true) + if (nodeService.exists(actionedUponNodeRef) == true && + nodeService.hasAspect(actionedUponNodeRef, ContentModel.ASPECT_PENDING_DELETE) == false && + (recordService.isRecord(actionedUponNodeRef) == true || + recordsManagementService.isRecordFolder(actionedUponNodeRef) == true)) { freezeService.freeze((String) action.getParameterValue(PARAM_REASON), actionedUponNodeRef); }