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 2017/06/23 15:52:41 UTC
[2/4] lucene-solr:master: SOLR-10907: Fix Resource Leak warning in
ExpandComponent.
SOLR-10907: Fix Resource Leak warning in ExpandComponent.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/55b0227d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/55b0227d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/55b0227d
Branch: refs/heads/master
Commit: 55b0227d8cc469e755c9bef4b338b36911c17a13
Parents: a6f4f2d
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Jun 23 11:04:52 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Jun 23 15:47:24 2017 +0100
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../org/apache/solr/handler/component/ExpandComponent.java | 9 +++++++--
2 files changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/55b0227d/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 85535c3..fa0462c 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -199,6 +199,8 @@ Bug Fixes
thus disabling the global check, and replaces it with specific checks where desired via
QueryUtils.build(). (yonik)
+* SOLR-10907: Fix Resource Leak warning in ExpandComponent. (Christine Poerschke)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/55b0227d/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java b/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
index 8b4fac1..016cc60 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
@@ -216,8 +216,13 @@ public class ExpandComponent extends SearchComponent implements PluginInfoInitia
if(CollapsingQParserPlugin.HINT_TOP_FC.equals(hint)) {
Map<String, UninvertingReader.Type> mapping = new HashMap();
mapping.put(field, UninvertingReader.Type.SORTED);
- UninvertingReader uninvertingReader = new UninvertingReader(new ReaderWrapper(searcher.getSlowAtomicReader(), field), mapping);
- values = uninvertingReader.getSortedDocValues(field);
+ try (UninvertingReader uninvertingReader = new UninvertingReader(
+ new ReaderWrapper(
+ searcher.getSlowAtomicReader(),
+ field),
+ mapping)) {
+ values = uninvertingReader.getSortedDocValues(field);
+ }
} else {
values = DocValues.getSorted(reader, field);
}