diff --git a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml index 63ccdb75e8..51dad9f953 100644 --- a/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml +++ b/rm-community/rm-community-repo/config/alfresco/module/org_alfresco_module_rm/patch/rm-patch-v35-context.xml @@ -10,7 +10,7 @@ parent="rm.parentModulePatch" class="org.alfresco.module.org_alfresco_module_rm.patch.v35.RMv35HoldNewChildAssocPatch"> - + diff --git a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v35/RMv35HoldNewChildAssocPatch.java b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v35/RMv35HoldNewChildAssocPatch.java index 368e4c7e50..59670184ad 100644 --- a/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v35/RMv35HoldNewChildAssocPatch.java +++ b/rm-community/rm-community-repo/source/java/org/alfresco/module/org_alfresco_module_rm/patch/v35/RMv35HoldNewChildAssocPatch.java @@ -122,12 +122,13 @@ public class RMv35HoldNewChildAssocPatch extends AbstractModulePatch ASSOC_FROZEN_CONTENT, RegexQNamePattern.MATCH_ALL); for (ChildAssociationRef ref : frozenAssoc) { + NodeRef nodeRef = ref.getChildRef(); //search the second parent - List parentAssoc = nodeService.getParentAssocs(ref.getChildRef(), ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL); + List parentAssoc = nodeService.getParentAssocs(nodeRef, ASSOC_CONTAINS, RegexQNamePattern.MATCH_ALL); if (parentAssoc.isEmpty()) { - ChildAssociationRef primaryParentAssoc = nodeService.getPrimaryParent(hold); - nodeService.addChild(hold, hold, ASSOC_CONTAINS, primaryParentAssoc.getQName()); + ChildAssociationRef primaryParentAssoc = nodeService.getPrimaryParent(nodeRef); + nodeService.addChild(hold, nodeRef, ASSOC_CONTAINS, primaryParentAssoc.getQName()); } } }