From a9ea9897c444b3f36598a0fac63eb24274d4e22e Mon Sep 17 00:00:00 2001 From: Steven Glover Date: Tue, 10 Sep 2013 15:50:26 +0000 Subject: [PATCH] ALF-19234 "An Editor (probably also Collaborator) can take ownership of a document (probably also folders)" fix NPE in acl code git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@55195 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/security/permissions/impl/acegi/ACLEntryVoter.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoter.java b/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoter.java index f56a002262..fbe5320eab 100644 --- a/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoter.java +++ b/source/java/org/alfresco/repo/security/permissions/impl/acegi/ACLEntryVoter.java @@ -477,7 +477,8 @@ public class ACLEntryVoter implements AccessDecisionVoter, InitializingBean else if (QName.class.isAssignableFrom(params[1]) && params[2] != null) { testNodeRef = getArgument(invocation, cad.parameter[0]); - boolean isChanged = !getArgument(invocation, 2).toString().equals(ownableService.getOwner(testNodeRef)); + Object arg2 = getArgument(invocation, 2); + boolean isChanged = (arg2 != null && !arg2.toString().equals(ownableService.getOwner(testNodeRef))); if (!isChanged) {