svn commit: r1393834 - in /lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x: Lucene3xFields.java TermInfosReader.java

[rm...@apache.org]

Author: rmuir
Date: Wed Oct  3 23:44:41 2012
New Revision: 1393834

URL: http://svn.apache.org/viewvc?rev=1393834&view=rev
Log:
close correctly

Modified:
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReader.java

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java?rev=1393834&r1=1393833&r2=1393834&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java Wed Oct  3 23:44:41 2012
@@ -41,6 +41,7 @@ import org.apache.lucene.store.IOContext
 import org.apache.lucene.store.IndexInput;
 import org.apache.lucene.util.Bits;
 import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.IOUtils;
 import org.apache.lucene.util.UnicodeUtil;
 
 /** Exposes flex API on a pre-flex index, as a codec. 
@@ -163,21 +164,7 @@ class Lucene3xFields extends FieldsProdu
 
   @Override
   public void close() throws IOException {
-    if (tis != null) {
-      tis.close();
-    }
-    if (tisNoIndex != null) {
-      tisNoIndex.close();
-    }
-    if (cfsReader != null) {
-      cfsReader.close();
-    }
-    if (freqStream != null) {
-      freqStream.close();
-    }
-    if (proxStream != null) {
-      proxStream.close();
-    }
+    IOUtils.close(tis, tisNoIndex, cfsReader, freqStream, proxStream);
   }
   
   private class PreTerms extends Terms {

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReader.java?rev=1393834&r1=1393833&r2=1393834&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReader.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/TermInfosReader.java Wed Oct  3 23:44:41 2012
@@ -17,6 +17,7 @@ package org.apache.lucene.codecs.lucene3
  * limitations under the License.
  */
 
+import java.io.Closeable;
 import java.io.IOException;
 import java.util.Comparator;
 
@@ -38,7 +39,7 @@ import org.apache.lucene.util.DoubleBarr
  * @lucene.experimental
  */
 @Deprecated
-final class TermInfosReader {
+final class TermInfosReader implements Closeable {
   private final Directory directory;
   private final String segment;
   private final FieldInfos fieldInfos;
@@ -155,7 +156,7 @@ final class TermInfosReader {
     return origEnum.maxSkipLevels;
   }
 
-  void close() throws IOException {
+  public void close() throws IOException {
     if (origEnum != null)
       origEnum.close();
     threadResources.close();