From 79436c9bb4c00a93c061f3bd516a11768c83cbc1 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 31 Jan 2015 10:42:18 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 89728: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 89707: Merged V4.2.2 (4.2.2.14) to V4.2-BUG-FIX (4.2.4) 86038: MNT-12458: CLONE - Setting synchronization.allowDeletions to false breaks Groups synchronization In ChainingUserRegistrySynchronizer.processGroups() was added check: !groupsToCreate.isEmpty(). git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94636 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/security/sync/ChainingUserRegistrySynchronizer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java b/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java index 5d762e4240..1c75e679b4 100644 --- a/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java +++ b/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java @@ -1427,7 +1427,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean { // If we got back some groups, we have to cross reference them with the set of known authorities // MNT-9711 fix. If allowDeletions is false, there is no need to pull all users and all groups from LDAP during the full synchronization. - if (allowDeletions && (isFullSync || !this.groupParentAssocsToDelete.isEmpty())) + if ((allowDeletions || !groupsToCreate.isEmpty()) && (isFullSync || !this.groupParentAssocsToDelete.isEmpty())) { final Set allZonePersons = newPersonSet(); final Set allZoneGroups = new TreeSet();