Merged /DEV/BUGFIXING/HEAD-2014_12_09 to HEAD:

92077: RM-1770 Not possible to delete parent/child reference

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@92096 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tuna Aksoy
2014-12-09 17:01:53 +00:00
parent 3d7c41cbc8
commit 42f5dc5e5f
2 changed files with 80 additions and 2 deletions

View File

@@ -487,8 +487,9 @@ public class RelationshipServiceImpl extends RecordsManagementAdminBase implemen
// Get the association definition name
final QName associationDefinitionName = associationDefinition.getName();
final NodeRef targetNode = target;
final NodeRef sourceNode = source;
invokeBeforeRemoveReference(source, targetNode, associationDefinitionName);
invokeBeforeRemoveReference(sourceNode, targetNode, associationDefinitionName);
if (associationDefinition.isChild())
{
@@ -497,7 +498,7 @@ public class RelationshipServiceImpl extends RecordsManagementAdminBase implemen
@Override
public Void doWork()
{
List<ChildAssociationRef> children = getNodeService().getChildAssocs(targetNode);
List<ChildAssociationRef> children = getNodeService().getChildAssocs(sourceNode);
for (ChildAssociationRef chRef : children)
{
if (associationDefinitionName.equals(chRef.getTypeQName()) && chRef.getChildRef().equals(targetNode))