You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2023/09/29 11:21:29 UTC

[lucene] 02/02: SuggestIndexSearcher.suggest catches any CollectionTerminatedException (theoretically) thrown by getLeafCollector (#12609)

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

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

commit a7acca4dc41091575d000087948ce08b6ff303ce
Author: Christine Poerschke <cp...@apache.org>
AuthorDate: Fri Sep 29 12:14:50 2023 +0100

    SuggestIndexSearcher.suggest catches any CollectionTerminatedException (theoretically) thrown by getLeafCollector (#12609)
    
    (cherry picked from commit 411b7fd51861b77e4cf2644c02dd6c6d92011a1f)
---
 .../lucene/search/suggest/document/SuggestIndexSearcher.java       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestIndexSearcher.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestIndexSearcher.java
index 0c88359029b..f89efeffb06 100644
--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestIndexSearcher.java
+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestIndexSearcher.java
@@ -68,8 +68,9 @@ public class SuggestIndexSearcher extends IndexSearcher {
     for (LeafReaderContext context : getIndexReader().leaves()) {
       BulkScorer scorer = weight.bulkScorer(context);
       if (scorer != null) {
-        LeafCollector leafCollector = collector.getLeafCollector(context);
+        LeafCollector leafCollector = null;
         try {
+          leafCollector = collector.getLeafCollector(context);
           scorer.score(leafCollector, context.reader().getLiveDocs());
         } catch (
             @SuppressWarnings("unused")
@@ -77,7 +78,9 @@ public class SuggestIndexSearcher extends IndexSearcher {
           // collection was terminated prematurely
           // continue with the following leaf
         }
-        leafCollector.finish();
+        if (leafCollector != null) {
+          leafCollector.finish();
+        }
       }
     }
   }