diff --git a/src/main/java/it/cavallium/dbengine/lucene/LuceneUtils.java b/src/main/java/it/cavallium/dbengine/lucene/LuceneUtils.java index 13675b7..ff8c9bd 100644 --- a/src/main/java/it/cavallium/dbengine/lucene/LuceneUtils.java +++ b/src/main/java/it/cavallium/dbengine/lucene/LuceneUtils.java @@ -793,15 +793,12 @@ public class LuceneUtils { LocalQueryParams queryParams, String keyFieldName, GlobalQueryRewrite transformer) { - return Mono.usingWhen(indexSearcherMono, indexSearcher -> { - try (UnshardedIndexSearchers indexSearchers = LLIndexSearchers.unsharded(indexSearcher)) { - return Mono - .fromCallable(() -> transformer.rewrite(indexSearchers, queryParams)) - .transform(LuceneUtils::scheduleLucene) - .flatMap(queryParams2 -> - localSearcher.collect(indexSearcherMono, queryParams2, keyFieldName, NO_REWRITE)); - } - }, LLUtils::finalizeResource); + return Mono.usingWhen(indexSearcherMono.map(LLIndexSearchers::unsharded), indexSearchers -> Mono + .fromCallable(() -> transformer.rewrite(indexSearchers, queryParams)) + .transform(LuceneUtils::scheduleLucene) + .flatMap(queryParams2 -> + localSearcher.collect(indexSearcherMono, queryParams2, keyFieldName, NO_REWRITE)), + LLUtils::finalizeResource); } /**