Changeset 29106

Show
Ignore:
Timestamp:
01/17/08 15:59:12 (11 months ago)
Author:
ogrisel
Message:

NXP-1948: ACPImpl.getMergedACLs should never return null but an empty ACL instead

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • org.nuxeo.ecm.core/branches/1.4/nuxeo-core-api/src/main/java/org/nuxeo/ecm/core/api/security/impl/ACPImpl.java

    r29101 r29106  
    146146 
    147147    public ACL getMergedACLs(String name) { 
    148         if (acls.isEmpty()) { 
    149             return null; 
    150         } 
    151148        ACL mergedAcl = new ACLImpl(name, true); 
    152149        for (ACL acl : acls) { 

  • org.nuxeo.ecm.core/branches/1.4/nuxeo-core-jcr-connector/src/main/java/org/nuxeo/ecm/core/repository/jcr/JCRSecurityManager.java

    r28105 r29106  
    425425            if (acp != null) { 
    426426                ACL acl = acp.getMergedACLs(ACL.INHERITED_ACL); 
    427                 if (acl != null) { 
    428                     if (inheritedAcls == null) { 
    429                         inheritedAcls = acl; 
    430                     } else { 
    431                         inheritedAcls.addAll(acl); 
    432                     } 
     427                if (inheritedAcls == null) { 
     428                    inheritedAcls = acl; 
     429                } else { 
     430                    inheritedAcls.addAll(acl); 
    433431                } 
    434432                if (acp.getAccess(SecurityConstants.EVERYONE,