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

Check for null Long to prevent vague unboxing NPE

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@21898 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2010-08-20 11:55:28 +00:00
parent a11e5505ca
commit bda714b422
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
source/java/org/alfresco/repo/domain/permissions/AclDAOImpl.java
View File

@@ -50,6 +50,7 @@ import org.alfresco.service.cmr.security.AuthorityType;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.util.GUID; import org.alfresco.util.GUID;
import org.alfresco.util.Pair; import org.alfresco.util.Pair;
import org.alfresco.util.ParameterCheck;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
@@ -941,8 +942,8 @@ public class AclDAOImpl implements AclDAO
return acls; return acls;
} }
/* (non-Javadoc) /**
* @see org.alfresco.repo.domain.permissions.AclDAO#deleteLocalAccessControlEntries(java.lang.Long) * {@inheritDoc}
*/ */
public List<AclChange> deleteLocalAccessControlEntries(Long id) public List<AclChange> deleteLocalAccessControlEntries(Long id)
{ {
@@ -954,8 +955,8 @@ public class AclDAOImpl implements AclDAO
return changes; return changes;
} }
/* (non-Javadoc) /**
* @see org.alfresco.repo.domain.permissions.AclDAO#deleteInheritedAccessControlEntries(java.lang.Long) * {@inheritDoc}
*/ */
public List<AclChange> deleteInheritedAccessControlEntries(Long id) public List<AclChange> deleteInheritedAccessControlEntries(Long id)
{ {
@@ -967,8 +968,8 @@ public class AclDAOImpl implements AclDAO
return changes; return changes;
} }
/* (non-Javadoc) /**
* @see org.alfresco.repo.domain.permissions.AclDAO#deleteAccessControlEntries(java.lang.Long, org.alfresco.repo.security.permissions.AccessControlEntry) * {@inheritDoc}
*/ */
public List<AclChange> deleteAccessControlEntries(Long id, AccessControlEntry pattern) public List<AclChange> deleteAccessControlEntries(Long id, AccessControlEntry pattern)
{ {
@@ -978,24 +979,25 @@ public class AclDAOImpl implements AclDAO
return changes; return changes;
} }
/* (non-Javadoc) /**
* @see org.alfresco.repo.domain.permissions.AclDAO#getDbAccessControlList(java.lang.Long) * {@inheritDoc}
*/ */
public Acl getAcl(Long id) public Acl getAcl(Long id)
{ {
return aclCrudDAO.getAcl(id); return aclCrudDAO.getAcl(id);
} }
/* (non-Javadoc) /**
* @see org.alfresco.repo.domain.permissions.AclDAO#getAccessControlListProperties(java.lang.Long) * {@inheritDoc}
*/ */
public AccessControlListProperties getAccessControlListProperties(Long id) public AccessControlListProperties getAccessControlListProperties(Long id)
{ {
ParameterCheck.mandatory("id", id); // Prevent unboxing failures
return aclCrudDAO.getAcl(id); return aclCrudDAO.getAcl(id);
} }
/* (non-Javadoc) /**
* @see org.alfresco.repo.domain.permissions.AclDAO#getAccessControlList(java.lang.Long) * {@inheritDoc}
*/ */
public AccessControlList getAccessControlList(Long id) public AccessControlList getAccessControlList(Long id)
{ {
@@ -1013,7 +1015,6 @@ public class AclDAOImpl implements AclDAO
} }
/** /**
* @param id
* @return the access control list * @return the access control list
*/ */
private AccessControlList getAccessControlListImpl(final Long id) private AccessControlList getAccessControlListImpl(final Long id)