From 31372598d1a7fea2d6fca910a32250774243313e Mon Sep 17 00:00:00 2001 From: Dave Ward Date: Mon, 25 Jun 2012 16:50:41 +0000 Subject: [PATCH] Merged V4.1-BUG-FIX to HEAD 38298: Fix for ALF-13737 - Error when 'favoriting' Company Home 38303: Fix for ALF-10688 - Can't deactivate an account 38307: ALF-14583: Latest Surf libs (r1092) to update .tld files to comply to strict DTD 38314: Merged V3.4-BUG-FIX to V4.1-BUG-FIX 38313: Merged V3.4 to V3.4-BUG-FIX 38257: ALF-14646: Log rotation is broken in 3.4.10 - Use a different log4j log file for each web application 38266: ALF-14769: Deployment Installer: Title for 'Confirm password' field is absent on 'User Account Details' form - Specified a descriptionRetype prompt 38306: ALF-13751: Missing change concerning preserving the AUTH.ALF zone on rezoned groups as well as persons git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@38316 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/security/sync/ChainingUserRegistrySynchronizer.java | 4 +--- 1 file changed, 1 insertion(+), 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 fac22758b7..c21dd8af8b 100644 --- a/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java +++ b/source/java/org/alfresco/repo/security/sync/ChainingUserRegistrySynchronizer.java @@ -873,9 +873,7 @@ public class ChainingUserRegistrySynchronizer extends AbstractLifecycleBean impl + "'. This group will in future be assumed to originate from user registry '" + zone + "'."); } - ChainingUserRegistrySynchronizer.this.authorityService.removeAuthorityFromZones(groupName, - groupZones); - ChainingUserRegistrySynchronizer.this.authorityService.addAuthorityToZones(groupName, zoneSet); + updateAuthorityZones(groupName, groupZones, zoneSet); // The group now exists in this zone: update the group updateGroup(group, true);