From b644b4d440da4fffb19adc3dfc83af5d5faf2eb6 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Tue, 11 Feb 2014 23:47:38 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 58522: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3) 58512: Reverse merge << Caused 5 build errors >> 58449: Merged DEV to V4.2-BUG-FIX (4.2.1) 58425 : MNT-9711: ldap synchronization algorithm is not optimal - The verification for deleting permissions was added for the full synchronization. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62004 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/security/sync/ChainingUserRegistrySynchronizer.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java b/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java index e3a87fd027..0717895e0e 100644 --- a/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java +++ b/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java @@ -1469,9 +1469,8 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean private void processGroups(UserRegistry userRegistry, boolean isFullSync, boolean splitTxns) { // 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() - || !this.groupParentAssocsToDelete.isEmpty())) + if (isFullSync || !this.groupParentAssocsToDelete.isEmpty() + || !this.groupParentAssocsToDelete.isEmpty()) { final Set allZonePersons = newPersonSet(); final Set allZoneGroups = new TreeSet();