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/BRANCHES/DEV/5.2.N/root@131796 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Raluca Munteanu
2016-10-26 13:56:49 +00:00
parent 036a01d5ba
commit 18b534b4ac

View File

@@ -755,11 +755,10 @@ public class SitesImpl implements Sites
private List<FilterProp> getFilterPropListOfSites(final Parameters parameters) private List<FilterProp> getFilterPropListOfSites(final Parameters parameters)
{ {
List<FilterProp> filterProps = null; List<FilterProp> filterProps = new ArrayList<FilterProp>();
Query q = parameters.getQuery(); Query q = parameters.getQuery();
if (q != null) if (q != null)
{ {
filterProps = new ArrayList<FilterProp>();
MapBasedQueryWalkerOrSupported propertyWalker = new MapBasedQueryWalkerOrSupported(LIST_SITES_EQUALS_QUERY_PROPERTIES, null); MapBasedQueryWalkerOrSupported propertyWalker = new MapBasedQueryWalkerOrSupported(LIST_SITES_EQUALS_QUERY_PROPERTIES, null);
QueryHelper.walk(q, propertyWalker); 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) private boolean includeFilter(SiteMembership siteMembership, List<FilterProp> filterProps)