Skip to content

Commit aafd7f9

Browse files
authored
[TEST] fix NPE when generating random query (#26023)
`ClusterSearchShardsResponseTests.testSerialization` randomly uses `IdsQueryBuilderTests` to generate an alias filter. `IdsQueryBuilderTests` shecks if the array of current types is length zero but it can also be null which causes a `NullPointerException`. This changes adds a null check to avoid the exception. Closes #26021
1 parent bb3d5b7 commit aafd7f9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

core/src/test/java/org/elasticsearch/index/query/IdsQueryBuilderTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
package org.elasticsearch.index.query;
2121

2222

23-
import org.apache.lucene.search.TermInSetQuery;
2423
import org.apache.lucene.search.MatchNoDocsQuery;
2524
import org.apache.lucene.search.Query;
25+
import org.apache.lucene.search.TermInSetQuery;
2626
import org.elasticsearch.cluster.metadata.MetaData;
2727
import org.elasticsearch.common.ParsingException;
2828
import org.elasticsearch.index.mapper.UidFieldMapper;
@@ -39,7 +39,7 @@ public class IdsQueryBuilderTests extends AbstractQueryTestCase<IdsQueryBuilder>
3939
@Override
4040
protected IdsQueryBuilder doCreateTestQueryBuilder() {
4141
String[] types;
42-
if (getCurrentTypes().length > 0 && randomBoolean()) {
42+
if (getCurrentTypes() != null && getCurrentTypes().length > 0 && randomBoolean()) {
4343
int numberOfTypes = randomIntBetween(1, getCurrentTypes().length);
4444
types = new String[numberOfTypes];
4545
for (int i = 0; i < numberOfTypes; i++) {

0 commit comments

Comments
 (0)