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 
57505: Merged V4.2-BUG-FIX (4.2.1) to HEAD-BUG-FIX (Cloud/4.3)
      57346: Merged DEV to V4.2-BUG-FIX (4.2.1)
         57172: MNT-9768 : ChainingUserRegistrySynchronizerTest never ending on SQL Server
         Changed the API to use the synchronization only with split transactions. Fixed the test to pass on SQL Server.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@61835 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-11 20:57:41 +00:00
parent 2472193140
commit d33d2335f8
3 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -450,12 +450,24 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean
Object params[] = {authenticatorName};
throw new AuthenticationException("authentication.err.validation.authenticator.notfound", params);
}
/*
* (non-Javadoc)
* @see org.alfresco.repo.security.sync.UserRegistrySynchronizer#synchronize(boolean, boolean, boolean)
*/
@Override
public void synchronize(boolean forceUpdate, boolean isFullSync, final boolean splitTxns)
{
synchronizeInternal(forceUpdate, isFullSync, splitTxns);
}
@Override
public void synchronize(boolean forceUpdate, boolean isFullSync)
{
synchronizeInternal(forceUpdate, isFullSync, true);
}
private void synchronizeInternal(boolean forceUpdate, boolean isFullSync, final boolean splitTxns)
{
if (ChainingUserRegistrySynchronizer.logger.isDebugEnabled())
{
@@ -1454,7 +1466,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean
}
}
public 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 (isFullSync || !this.groupParentAssocsToDelete.isEmpty()
@@ -1634,7 +1646,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean
}
}
public void finalizeAssociations(UserRegistry userRegistry, boolean splitTxns)
private void finalizeAssociations(UserRegistry userRegistry, boolean splitTxns)
{
// First validate the group associations to be created for potential cycles. Remove any offending association
validateGroupParentAssocsToCreate();