From e82595b2982578264f44f711cb9fb569ecc0eb0e Mon Sep 17 00:00:00 2001 From: Neil McErlean Date: Tue, 10 Feb 2015 14:40:09 +0000 Subject: [PATCH] Probable fix for RM-1886. It's not clear to me what the correct code is in this method, but I've changed what's there by comparing it to the AssociationRef-typed method below it. My changes seem reasonable. Probably needs review. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.3@96724 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../capability/RMAfterInvocationProvider.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java index 60431bb697..fc2ff23fe4 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java @@ -76,13 +76,8 @@ public class RMAfterInvocationProvider extends RMSecurityCommon public boolean supports(ConfigAttribute configAttribute) { - boolean supports = false; String attribute = configAttribute.getAttribute(); - if (StringUtils.isNotBlank(attribute) && attribute.startsWith(AFTER_RM)) - { - supports = true; - } - return supports; + return (StringUtils.isNotBlank(attribute) && attribute.startsWith(AFTER_RM)); } @SuppressWarnings("rawtypes") @@ -292,10 +287,9 @@ public class RMAfterInvocationProvider extends RMSecurityCommon } - @SuppressWarnings({"rawtypes" }) private List extractSupportedDefinitions(ConfigAttributeDefinition config) { - List definitions = new ArrayList(); + List definitions = new ArrayList<>(); Iterator iter = config.getConfigAttributes(); while (iter.hasNext()) @@ -332,7 +326,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon { NodeRef testNodeRef = null; - if (cad.typeString.equals(cad.parent)) + if (cad.parent) { testNodeRef = returnedObject.getParentRef(); } @@ -348,7 +342,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon continue; } - if (cad.typeString.equals(cad.parent) && parentReadCheck != AccessDecisionVoter.ACCESS_GRANTED) + if (cad.parent && parentReadCheck != AccessDecisionVoter.ACCESS_GRANTED) { throw new AccessDeniedException("Access Denied"); }