From 36dbb45644270a61606b0b4e32043df0489e19fb Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 12 Feb 2014 02:13:03 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 59731: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3) 59502: Merged DEV to V4.2-BUG-FIX (4.2.1) 59297 : MNT-10233: PermissionsManager : permissions property doesn't work - permissions property behavior in PermissionsManager is fixed. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62174 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/security/person/PermissionsManagerImpl.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/source/java/org/alfresco/repo/security/person/PermissionsManagerImpl.java b/source/java/org/alfresco/repo/security/person/PermissionsManagerImpl.java index fe588a5695..dec0c64759 100644 --- a/source/java/org/alfresco/repo/security/person/PermissionsManagerImpl.java +++ b/source/java/org/alfresco/repo/security/person/PermissionsManagerImpl.java @@ -18,17 +18,16 @@ */ package org.alfresco.repo.security.person; -import java.util.Map; -import java.util.Set; - import org.alfresco.repo.security.permissions.impl.AccessPermissionImpl; -import org.alfresco.service.ServiceRegistry; import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.security.AccessPermission; import org.alfresco.service.cmr.security.AccessStatus; import org.alfresco.service.cmr.security.OwnableService; import org.alfresco.service.cmr.security.PermissionService; +import java.util.Map; +import java.util.Set; + public class PermissionsManagerImpl implements PermissionsManager { @@ -159,7 +158,7 @@ public class PermissionsManagerImpl implements PermissionsManager { for (String userForPermission : permissions.keySet()) { - Set set = permissions.get(user); + Set set = permissions.get(userForPermission); if (set != null) { for (String permission : set) @@ -223,7 +222,7 @@ public class PermissionsManagerImpl implements PermissionsManager { for (String userForPermission : permissions.keySet()) { - Set set = permissions.get(user); + Set set = permissions.get(userForPermission); if (set != null) { for (String permission : set)