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 
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
This commit is contained in:
Alan Davis
2014-02-12 02:13:03 +00:00
parent c7333f4a99
commit 36dbb45644
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/repo/security/person/PermissionsManagerImpl.java
View File

@@ -18,17 +18,16 @@
*/ */
package org.alfresco.repo.security.person; 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.repo.security.permissions.impl.AccessPermissionImpl;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.security.AccessPermission; import org.alfresco.service.cmr.security.AccessPermission;
import org.alfresco.service.cmr.security.AccessStatus; import org.alfresco.service.cmr.security.AccessStatus;
import org.alfresco.service.cmr.security.OwnableService; import org.alfresco.service.cmr.security.OwnableService;
import org.alfresco.service.cmr.security.PermissionService; import org.alfresco.service.cmr.security.PermissionService;
import java.util.Map;
import java.util.Set;
public class PermissionsManagerImpl implements PermissionsManager public class PermissionsManagerImpl implements PermissionsManager
{ {
@@ -159,7 +158,7 @@ public class PermissionsManagerImpl implements PermissionsManager
{ {
for (String userForPermission : permissions.keySet()) for (String userForPermission : permissions.keySet())
{ {
Set<String> set = permissions.get(user); Set<String> set = permissions.get(userForPermission);
if (set != null) if (set != null)
{ {
for (String permission : set) for (String permission : set)
@@ -223,7 +222,7 @@ public class PermissionsManagerImpl implements PermissionsManager
{ {
for (String userForPermission : permissions.keySet()) for (String userForPermission : permissions.keySet())
{ {
Set<String> set = permissions.get(user); Set<String> set = permissions.get(userForPermission);
if (set != null) if (set != null)
{ {
for (String permission : set) for (String permission : set)