Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (4.3/Cloud)

73883: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      73717:  Merged DEV to V4.2-BUG-FIX (4.2.3)
         73669: MNT-11163: CMIS - querying for folders raises CmisPermissionDeniedException 
           - CmisPermissionDeniedException is fixed.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@74829 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-06-25 16:11:26 +00:00
parent 176c2069be
commit 20fe538cb3
2 changed files with 87 additions and 1 deletions

View File

@@ -805,7 +805,24 @@ public class CMISNodeInfoImpl implements CMISNodeInfo
ChildAssociationRef assocRef = ((ChildAssocElement) element).getRef();
NodeRef node = assocRef.getChildRef();
displayPath.append("/");
displayPath.append(connector.getNodeService().getProperty(node, ContentModel.PROP_NAME));
try
{
String propertyName = (String) connector.getNodeService().getProperty(node, ContentModel.PROP_NAME);
displayPath.append(propertyName);
}
catch (AccessDeniedException e)
{
// if the user does not have enough permissions to construct the entire path then the object
// should have a null path
return null;
}
// Somewhere this has not been wrapped correctly
catch (net.sf.acegisecurity.AccessDeniedException e)
{
// if the user does not have enough permissions to construct the entire path then the object
// should have a null path
return null;
}
}
i++;
}