From f7ce3590b64c0017e1b389f7989476d1e26b5711 Mon Sep 17 00:00:00 2001 From: Gethin James Date: Wed, 30 Apr 2014 10:00:58 +0000 Subject: [PATCH] findSites() catches LuceneQueryParserException, logs it but supresses it from the user. ACE-1513 git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68308 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/site/SiteServiceImpl.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/site/SiteServiceImpl.java b/source/java/org/alfresco/repo/site/SiteServiceImpl.java index 5bb0a1bc96..56fabc19d6 100644 --- a/source/java/org/alfresco/repo/site/SiteServiceImpl.java +++ b/source/java/org/alfresco/repo/site/SiteServiceImpl.java @@ -58,6 +58,7 @@ import org.alfresco.repo.node.getchildren.GetChildrenCannedQueryFactory; import org.alfresco.repo.policy.BehaviourFilter; import org.alfresco.repo.policy.JavaBehaviour; import org.alfresco.repo.policy.PolicyComponent; +import org.alfresco.repo.search.impl.lucene.LuceneQueryParserException; import org.alfresco.repo.security.authentication.AuthenticationContext; import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil.RunAsWork; @@ -111,7 +112,6 @@ import org.json.JSONObject; import org.springframework.context.ApplicationEvent; import org.springframework.extensions.surf.util.AbstractLifecycleBean; import org.springframework.extensions.surf.util.ParameterCheck; -import org.springframework.util.StringUtils; /** * Site Service Implementation. Also bootstraps the site AVM and DM stores. @@ -882,18 +882,25 @@ public class SiteServiceImpl extends AbstractLifecycleBean implements SiteServic logger.debug("Search parameters are: " + sp); } - ResultSet results = this.searchService.query(sp); + ResultSet results = null; try { + results = this.searchService.query(sp); result = new ArrayList(results.length()); for (NodeRef site : results.getNodeRefs()) { result.add(createSiteInfo(site)); } } + catch (LuceneQueryParserException lqpe) + { + //Log the error but suppress is from the user + logger.error("LuceneQueryParserException with findSites()", lqpe); + result = Collections.emptyList(); + } finally { - results.close(); + if (results != null) results.close(); } }