From 79e65e00235fded2679d42ab0f5bf4e620fea4ea Mon Sep 17 00:00:00 2001
From: Tatyana Valkevych <tatyana.valkevych@alfresco.com>
Date: Tue, 19 May 2015 15:14:02 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)   
 104367: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud)       104293: Merged
 DEV to 5.0.N (5.0.2)          104276: MNT-14012 : Setting
 <display-facets>false</display-facets> throws InvalidQNameException          
   - skip empty facet names on search queries

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@104523 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 source/java/org/alfresco/repo/jscript/Search.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/source/java/org/alfresco/repo/jscript/Search.java b/source/java/org/alfresco/repo/jscript/Search.java
index 6e0ba9a827..73392fefcb 100644
--- a/source/java/org/alfresco/repo/jscript/Search.java
+++ b/source/java/org/alfresco/repo/jscript/Search.java
@@ -714,6 +714,10 @@ public class Search extends BaseScopableProcessorExtension implements Initializi
                     SolrFacetHelper solrFacetHelper = services.getSolrFacetHelper();
                     for (String field: facets)
                     {
+                        if (field.isEmpty())
+                        {
+                            continue;
+                        }
                         final String modifiedField = "@" + field;
                         if (solrFacetHelper.hasFacetQueries(modifiedField))
                         {