svn commit: r1814052 - /jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java

[catholicon]

Author: catholicon
Date: Thu Nov  2 10:15:52 2017
New Revision: 1814052

URL: http://svn.apache.org/viewvc?rev=1814052&view=rev
Log:
OAK-6895: Suggest directory lookup (query) isn't closed

Modified:
    
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java

Modified: 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java?rev=1814052&r1=1814051&r2=1814052&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReader.java
 Thu Nov  2 10:15:52 2017
@@ -24,6 +24,7 @@ import java.io.IOException;
 import javax.annotation.CheckForNull;
 import javax.annotation.Nullable;
 
+import com.google.common.io.Closer;
 import org.apache.jackrabbit.oak.plugins.index.lucene.util.SuggestHelper;
 import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.index.DirectoryReader;
@@ -34,17 +35,23 @@ import org.apache.lucene.store.Directory
 import static 
org.apache.jackrabbit.oak.plugins.index.lucene.directory.DirectoryUtils.dirSize;
 
 public class DefaultIndexReader implements LuceneIndexReader {
+    private final Closer closer;
     private final Directory directory;
     private final Directory suggestDirectory;
     private final IndexReader reader;
     private final AnalyzingInfixSuggester lookup;
 
     public DefaultIndexReader(Directory directory, @Nullable Directory 
suggestDirectory, Analyzer analyzer) throws IOException {
+        this.closer = Closer.create();
         this.directory = directory;
+        closer.register(this.directory);
         this.reader = DirectoryReader.open(directory);
+        closer.register(this.reader);
         this.suggestDirectory = suggestDirectory;
         if (suggestDirectory != null) {
+            closer.register(this.suggestDirectory);
             this.lookup = SuggestHelper.getLookup(suggestDirectory, analyzer);
+            closer.register(this.lookup);
         } else {
             this.lookup = null;
         }
@@ -74,10 +81,6 @@ public class DefaultIndexReader implemen
 
     @Override
     public void close() throws IOException {
-        try {
-            reader.close();
-        } finally {
-            directory.close();
-        }
+        closer.close();
     }
 }