From f80e8b5cbc1e6ba34d10e3ec19999033cc56cca0 Mon Sep 17 00:00:00 2001 From: Ana Bozianu Date: Wed, 4 Feb 2015 14:29:36 +0000 Subject: [PATCH] RM-1871 : Merged revision(s) 94472 from /DEV/BUGFIXING/HEAD-2014_12_09 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@96064 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../transfer/TransferServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java index 784bc49b5c..027b9d9920 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/transfer/TransferServiceImpl.java @@ -240,10 +240,16 @@ public class TransferServiceImpl extends ServiceBaseImpl List assocs = nodeService.getChildAssocs(nodeRef, ASSOC_TRANSFERRED, RegexQNamePattern.MATCH_ALL); for (ChildAssociationRef assoc : assocs) { - if (freezeService.hasFrozenChildren(assoc.getChildRef())) + if(freezeService.isFrozen(assoc.getChildRef())) { - throw new AlfrescoRuntimeException("Could not complete a transfer that contain frozen children."); + throw new AlfrescoRuntimeException("Could not complete a transfer that contains held folders"); } + + if(freezeService.hasFrozenChildren(assoc.getChildRef())) + { + throw new AlfrescoRuntimeException("Cound not complete a transfer that contains folders with held children"); + } + markComplete(assoc.getChildRef(), accessionIndicator, transferLocation); }