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

Probable fix for RM-1886.

Browse Source 
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
This commit is contained in:
Neil McErlean
2015-02-10 14:40:09 +00:00
parent 4c5568f1c5
commit e82595b298
1 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/capability/RMAfterInvocationProvider.java
View File

@@ -76,13 +76,8 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
public boolean supports(ConfigAttribute configAttribute) public boolean supports(ConfigAttribute configAttribute)
{ {
boolean supports = false;
String attribute = configAttribute.getAttribute(); String attribute = configAttribute.getAttribute();
if (StringUtils.isNotBlank(attribute) && attribute.startsWith(AFTER_RM)) return (StringUtils.isNotBlank(attribute) && attribute.startsWith(AFTER_RM));
{
supports = true;
}
return supports;
} }
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@@ -292,10 +287,9 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
} }
@SuppressWarnings({"rawtypes" })
private List<ConfigAttributeDefintion> extractSupportedDefinitions(ConfigAttributeDefinition config) private List<ConfigAttributeDefintion> extractSupportedDefinitions(ConfigAttributeDefinition config)
{ {
List<ConfigAttributeDefintion> definitions = new ArrayList<ConfigAttributeDefintion>(); List<ConfigAttributeDefintion> definitions = new ArrayList<>();
Iterator iter = config.getConfigAttributes(); Iterator iter = config.getConfigAttributes();
while (iter.hasNext()) while (iter.hasNext())
@@ -332,7 +326,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
{ {
NodeRef testNodeRef = null; NodeRef testNodeRef = null;
if (cad.typeString.equals(cad.parent)) if (cad.parent)
{ {
testNodeRef = returnedObject.getParentRef(); testNodeRef = returnedObject.getParentRef();
} }
@@ -348,7 +342,7 @@ public class RMAfterInvocationProvider extends RMSecurityCommon
continue; continue;
} }
if (cad.typeString.equals(cad.parent) && parentReadCheck != AccessDecisionVoter.ACCESS_GRANTED) if (cad.parent && parentReadCheck != AccessDecisionVoter.ACCESS_GRANTED)
{ {
throw new AccessDeniedException("Access Denied"); throw new AccessDeniedException("Access Denied");
} }