[lucene] branch main updated: Ensure TermInSetQuery ScoreSupplier never returns null Scorer

[gs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gsmiller pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene.git


The following commit(s) were added to refs/heads/main by this push:
     new 202dd809bdf Ensure TermInSetQuery ScoreSupplier never returns null Scorer
202dd809bdf is described below

commit 202dd809bdfeac50ada93805706028b069c0ad3e
Author: Greg Miller <gs...@gmail.com>
AuthorDate: Thu Sep 1 15:31:14 2022 -0700

    Ensure TermInSetQuery ScoreSupplier never returns null Scorer
---
 lucene/core/src/java/org/apache/lucene/search/TermInSetQuery.java | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/lucene/core/src/java/org/apache/lucene/search/TermInSetQuery.java b/lucene/core/src/java/org/apache/lucene/search/TermInSetQuery.java
index cd44ab5e1b2..144070e1d9b 100644
--- a/lucene/core/src/java/org/apache/lucene/search/TermInSetQuery.java
+++ b/lucene/core/src/java/org/apache/lucene/search/TermInSetQuery.java
@@ -386,12 +386,10 @@ public class TermInSetQuery extends Query implements Accountable {
           @Override
           public Scorer get(long leadCost) throws IOException {
             WeightOrDocIdSet weightOrDocIdSet = rewrite(context);
-            if (weightOrDocIdSet == null) {
-              return null;
-            }
-
             final Scorer scorer;
-            if (weightOrDocIdSet.weight != null) {
+            if (weightOrDocIdSet == null) {
+              scorer = null;
+            } else if (weightOrDocIdSet.weight != null) {
               scorer = weightOrDocIdSet.weight.scorer(context);
             } else {
               scorer = scorer(weightOrDocIdSet.set);