Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

57098: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      56604: Merged V4.1-BUG-FIX (4.1.7) to V4.2-BUG-FIX (4.2.1)
         56594: Merged DEV to V4.1-BUG-FIX(4.1.7) with corrections.
            56301: MNT-9597: "InvalidNodeRefException: Node does not exist" error of the Transfer service when the target node has a different nodeRef
             - Create reuiqred associations using resolved(existing) node. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61727 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 19:33:26 +00:00
parent 171be87cc8
commit e82810a925

View File

@@ -168,11 +168,16 @@ public class RepoSecondaryManifestProcessorImpl extends AbstractManifestProcesso
if (nodeService.exists(otherNode)) if (nodeService.exists(otherNode))
{ {
//the other node exists in this repo //the other node exists in this repo
NodeRef parent = isSource ? nodeRef : ref.sourceRef;
NodeRef child = isSource ? ref.targetRef : nodeRef;
if(log.isDebugEnabled()) if(log.isDebugEnabled())
{ {
log.debug("need to add peer assoc from:" + ref.sourceRef + ", to:" + ref.targetRef +", qname:" + ref.assocTypeQName); log.debug("need to add peer assoc from:" + parent + ", to:" + child +", qname:" + ref.assocTypeQName);
} }
nodeService.createAssociation(ref.sourceRef, ref.targetRef, ref.assocTypeQName);
nodeService.createAssociation(parent, child, ref.assocTypeQName);
} }
} }
} }