Skip to content

Commit 8005509

Browse files
committed
Fix build: add null checks to filtered query before checking IsConditionless
1 parent 147dbb5 commit 8005509

File tree

2 files changed

+3
-4
lines changed

2 files changed

+3
-4
lines changed

Diff for: src/Nest/DSL/Query/QueryDescriptor.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -466,10 +466,10 @@ public QueryContainer Filtered(Action<FilteredQueryDescriptor<T>> selector)
466466

467467
var filtered = query as IFilteredQuery;
468468

469-
if (filtered.Query.IsConditionless)
469+
if (filtered.Query != null && filtered.Query.IsConditionless)
470470
filtered.Query = null;
471471

472-
if (filtered.Filter.IsConditionless)
472+
if (filtered.Filter != null && filtered.Filter.IsConditionless)
473473
filtered.Filter = null;
474474

475475
return this.New(query, q => q.Filtered = query);

Diff for: src/Tests/Nest.Tests.Unit/Search/Filter/Singles/TermsFilterJson.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,7 @@ public void TermsFilterWithNullTerms()
165165
filtered: {
166166
query: {
167167
match_all: {}
168-
},
169-
filter: {}
168+
}
170169
}
171170
}";
172171
Assert.True(json.JsonEquals(expected), json);

0 commit comments

Comments
 (0)