Merged 5.2.N (5.2.1) to HEAD (5.2)

130094 jkaabimofrad: Merged 5.2.0-CLOUD44 (Cloud ) to 5.2.N (5.2.1)
      129940 jkaabimofrad: SFS-610: A fix for the V1 node API where listing children and including certain properties returned 403 in the Cloud context, when the owner is "admin@alfresco.com".


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130249 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-09-06 14:46:24 +00:00
parent 76e33da7f5
commit a43d3a126f

View File

@@ -33,6 +33,7 @@ import java.util.Map;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.permissions.AccessDeniedException;
import org.alfresco.rest.framework.resource.UniqueId;
import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.NodeRef;
@@ -162,6 +163,11 @@ public class Node implements Comparable<Node>
{
// drop-through
}
catch (AccessDeniedException ade)
{
// SFS-610
// drop-through
}
if (pInfo != null)
{