Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent 0a36e2af67
commit ab4ca7177f
1576 changed files with 36419 additions and 8603 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2010 Alfresco Software Limited.
* Copyright (C) 2005-2013 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -193,13 +193,17 @@ public abstract class AbstractAclCrudDAOImpl implements AclCrudDAO
return entityPair.getSecond();
}
public Acl getAcl(long id)
public Acl getAcl(Long id)
{
return getAclImpl(id);
}
private AclEntity getAclImpl(long id)
private AclEntity getAclImpl(Long id)
{
if (id == null)
{
return null;
}
Pair<Long, AclEntity> entityPair = aclEntityCache.getByKey(id);
if (entityPair == null)
{