Merged mward/repo-1600-zonesfilter (5.2.1) to 5.2.N (5.2.1)

134681 mward: REPO-1600: unknown zone results in 404


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@134803 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2017-01-30 09:58:52 +00:00
parent 90123678f5
commit 7a8c4c9688
2 changed files with 13 additions and 1 deletions

View File

@@ -216,7 +216,15 @@ public class GroupsImpl implements Groups
final AuthorityType authorityType = AuthorityType.GROUP;
final Set<String> rootAuthorities = getAllRootAuthorities(authorityType);
PagingResults<AuthorityInfo> pagingResult = getAuthoritiesInfo(authorityType, isRootParam, zoneFilter, rootAuthorities, sortProp, paging);
PagingResults<AuthorityInfo> pagingResult;
try
{
pagingResult = getAuthoritiesInfo(authorityType, isRootParam, zoneFilter, rootAuthorities, sortProp, paging);
}
catch (UnknownAuthorityException e)
{
throw new EntityNotFoundException("Zone "+zoneFilter+" does not exist.");
}
// Create response.
final List<AuthorityInfo> page = pagingResult.getPage();