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 18:26:53 UTC

lucene-solr:master: Revert "SOLR-10907: Fix Resource Leak warning in ExpandComponent."

Repository: lucene-solr
Updated Branches:
  refs/heads/master c20d3aff9 -> 05433eb70


Revert "SOLR-10907: Fix Resource Leak warning in ExpandComponent."

This reverts commit 55b0227d8cc469e755c9bef4b338b36911c17a13.


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/05433eb7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/05433eb7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/05433eb7

Branch: refs/heads/master
Commit: 05433eb70920b95c4441667c64150b4be8eb9ccc
Parents: c20d3af
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri Jun 23 19:26:21 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri Jun 23 19:26:21 2017 +0100

----------------------------------------------------------------------
 solr/CHANGES.txt                                            | 2 --
 .../org/apache/solr/handler/component/ExpandComponent.java  | 9 ++-------
 2 files changed, 2 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/05433eb7/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index fa0462c..85535c3 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -199,8 +199,6 @@ 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/05433eb7/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 016cc60..8b4fac1 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,13 +216,8 @@ 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);
-        try (UninvertingReader uninvertingReader = new UninvertingReader(
-            new ReaderWrapper(
-                searcher.getSlowAtomicReader(),
-                field),
-            mapping)) {
-          values = uninvertingReader.getSortedDocValues(field);
-        }
+        UninvertingReader uninvertingReader = new UninvertingReader(new ReaderWrapper(searcher.getSlowAtomicReader(), field), mapping);
+        values = uninvertingReader.getSortedDocValues(field);
       } else {
         values = DocValues.getSorted(reader, field);
       }