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 V3.0 to HEAD

Browse Source 
11301: Merged V2.2 to V3.0
      11296: Externalised the Hibernate sql-query
      11297: Fixed ETWOTWO-603: NPE check getting ACLs
      11298: ETWOTWO-594: Tidy up input stream closure
      11299: Minor javadoc change


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@12409 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-12-16 14:00:43 +00:00
parent 1f963e4f25
commit 0e3914fadc
5 changed files with 80 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
source/java/org/alfresco/repo/domain/hibernate/AbstractPermissionsDaoComponentImpl.java
View File

@@ -365,7 +365,16 @@ public abstract class AbstractPermissionsDaoComponentImpl implements Permissions
DbAccessControlList acl = null;
try
{
acl = getACLDAO(nodeRef).getAccessControlList(nodeRef);
AccessControlListDAO aclDAO = getACLDAO(nodeRef);
if (aclDAO == null)
{
return;
}
acl = aclDAO.getAccessControlList(nodeRef);
if (acl == null)
{
return;
}
}
catch (InvalidNodeRefException e)
{
@@ -402,7 +411,16 @@ public abstract class AbstractPermissionsDaoComponentImpl implements Permissions
DbAccessControlList acl = null;
try
{
acl = getACLDAO(nodeRef).getAccessControlList(nodeRef);
AccessControlListDAO aclDAO = getACLDAO(nodeRef);
if (aclDAO == null)
{
return;
}
acl = aclDAO.getAccessControlList(nodeRef);
if (acl == null)
{
return;
}
}
catch (InvalidNodeRefException e)
{