fix forTaqQuery.HasAnyAnd to handle empty collections

Hendy · Mar 5, 2019 · 6970576 · 6970576
1 parent f580257
commit 6970576
Showing 1 changed file with 11 additions and 8 deletions.
diff --git a/src/Our.Umbraco.Look/Services/LookService_Search.cs b/src/Our.Umbraco.Look/Services/LookService_Search.cs
@@ -454,16 +454,19 @@ public static LookResult Search(LookQuery lookQuery)
                     {
                         foreach (var tagCollection in lookQuery.TagQuery.HasAnyAnd)
                         {
-                            var anyTagQuery = new BooleanQuery();
-
-                            foreach (var tag in tagCollection)
+                            if (tagCollection.Any())
                             {
-                                anyTagQuery.Add(
-                                                new TermQuery(new Term(LookConstants.TagsField + tag.Group, tag.Name)),
-                                                BooleanClause.Occur.SHOULD);
-                            }
+                                var anyTagQuery = new BooleanQuery();
 
-                            query.Add(anyTagQuery, BooleanClause.Occur.MUST);
+                                foreach (var tag in tagCollection)
+                                {
+                                    anyTagQuery.Add(
+                                                    new TermQuery(new Term(LookConstants.TagsField + tag.Group, tag.Name)),
+                                                    BooleanClause.Occur.SHOULD);
+                                }
+
+                                query.Add(anyTagQuery, BooleanClause.Occur.MUST);
+                            }
                         }
 
                     }