Merged 5.2.N (5.2.1) to HEAD (5.2)

124222 amorarasu: Merged 5.1.N (5.1.2) to 5.2.N (5.2.1)
      124096 amorarasu: Merged 5.0.N (5.0.4) to 5.1.N (5.1.2)
         123996 sglover: MNT-15655 "Possible to violate child cm:name uniqueness constraint via NodeService.addAspect"


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@127740 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-06-03 15:55:11 +00:00
parent 31526de797
commit cd61c4f1e0
2 changed files with 116 additions and 1 deletions

View File

@@ -817,6 +817,8 @@ public class DbNodeServiceImpl extends AbstractNodeServiceImpl implements Extens
// Add aspect and defaults
Pair<Long, NodeRef> nodePair = getNodePairNotNull(nodeRef);
// SetProperties common tasks
setPropertiesCommonWork(nodePair, aspectProperties);
boolean modified = addAspectsAndProperties(
nodePair,
aspectTypeQName,