mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Merged V3.1 to HEAD
12983: Merged V2.1-A to V3.1 8668: Added authorityDisplayName 12985: Merged V2.1-A to V3.1 8706: (record-only) Build fixes after removing the guest user - DO NOT MERGE 12990: Merged V3.0 to V3.1 12922: Merged V2.2 to V3.0 12555: Fix ETWOTWO-972 (Remove Lookup Cache) 12558: Fix ETWOTWO-978 (L2 Cache removal for No Row Issues) 12928: Merged V2.2 to V3.0 11319: Fix for ETWOTWO-73 (missed merge ?) ___________________________________________________________________ Modified: svn:mergeinfo Merged /alfresco/BRANCHES/V2.1-A:r8668,8706 Merged /alfresco/BRANCHES/V3.0:r12922,12928 Merged /alfresco/BRANCHES/V2.2:r12555,12558 Merged /alfresco/BRANCHES/V3.1:r12983,12985,12990 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13546 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -427,6 +427,12 @@ public abstract class AbstractPermissionsDaoComponentImpl implements Permissions
|
||||
return;
|
||||
}
|
||||
|
||||
// avoid NullPointerException if it was not created
|
||||
if (acl == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
switch (acl.getAclType())
|
||||
{
|
||||
case FIXED:
|
||||
|
Reference in New Issue
Block a user