Fix issue if providing null custom filter.

Luc Boutier · Luc Boutier · commit 63125200001d · 2016-09-12T15:57:02.000+02:00
diff --git a/elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/QueryHelper.java b/elasticsearch-mapping/src/main/java/org/elasticsearch/mapping/QueryHelper.java
@@ -332,7 +332,9 @@ private QueryBuilder addFilters(QueryBuilder query, Class<?> clazz, Map<String,
             final List<FilterBuilder> esFilters = buildFilters(clazz.getName(), filters, filterStrategies);
             if (customFilters != null) {
                 for (FilterBuilder customFilter : customFilters) {
-                    esFilters.add(customFilter);
+                    if (customFilter != null) {
+                        esFilters.add(customFilter);
+                    }
                 }
 
             }

Original file line number	Diff line number	Diff line change
`@@ -332,7 +332,9 @@ private QueryBuilder addFilters(QueryBuilder query, Class<?> clazz, Map<String,`
`332`	`332`	`final List<FilterBuilder> esFilters = buildFilters(clazz.getName(), filters, filterStrategies);`
`333`	`333`	`if (customFilters != null) {`
`334`	`334`	`for (FilterBuilder customFilter : customFilters) {`
`335`		`- esFilters.add(customFilter);`
	`335`	`+ if (customFilter != null) {`
	`336`	`+ esFilters.add(customFilter);`
	`337`	`+ }`
`336`	`338`	`}`
`337`	`339`
`338`	`340`	`}`