inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
131796 rmunteanu: REPO-1390 , REPO-1391: Add support for retrieving site presets
      -  Fixed issue causing build failure;


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@132300 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-11-03 13:58:21 +00:00
parent 4618afdaa1
commit 04edee8754
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/java/org/alfresco/rest/api/impl/SitesImpl.java
View File

@@ -755,11 +755,10 @@ public class SitesImpl implements Sites
private List<FilterProp> getFilterPropListOfSites(final Parameters parameters)
{
List<FilterProp> filterProps = null;
List<FilterProp> filterProps = new ArrayList<FilterProp>();
Query q = parameters.getQuery();
if (q != null)
{
filterProps = new ArrayList<FilterProp>();
MapBasedQueryWalkerOrSupported propertyWalker = new MapBasedQueryWalkerOrSupported(LIST_SITES_EQUALS_QUERY_PROPERTIES, null);
QueryHelper.walk(q, propertyWalker);
@@ -777,7 +776,8 @@ public class SitesImpl implements Sites
}
}
return filterProps;
// expected null or non-empty list
return filterProps.isEmpty() ? null : filterProps;
}
private boolean includeFilter(SiteMembership siteMembership, List<FilterProp> filterProps)