inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Alan Davis
2014-02-11 23:47:38 +00:00
parent c0de7292bc
commit b644b4d440
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java
View File

@@ -1469,9 +1469,8 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean
private void processGroups(UserRegistry userRegistry, boolean isFullSync, boolean splitTxns) 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 // 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 (isFullSync || !this.groupParentAssocsToDelete.isEmpty()
if (allowDeletions && (isFullSync || !this.groupParentAssocsToDelete.isEmpty() || !this.groupParentAssocsToDelete.isEmpty())
|| !this.groupParentAssocsToDelete.isEmpty()))
{ {
final Set<String> allZonePersons = newPersonSet(); final Set<String> allZonePersons = newPersonSet();
final Set<String> allZoneGroups = new TreeSet<String>(); final Set<String> allZoneGroups = new TreeSet<String>();