svn commit: r1211718 - /lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40NormsReader.java

[us...@apache.org]

Author: uschindler
Date: Thu Dec  8 00:04:32 2011
New Revision: 1211718

URL: http://svn.apache.org/viewvc?rev=1211718&view=rev
Log:
LUCENE-3606: Simplyfy more

Modified:
    lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40NormsReader.java

Modified: lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40NormsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40NormsReader.java?rev=1211718&r1=1211717&r2=1211718&view=diff
==============================================================================
--- lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40NormsReader.java (original)
+++ lucene/dev/branches/lucene3606/lucene/src/java/org/apache/lucene/index/codecs/lucene40/Lucene40NormsReader.java Thu Dec  8 00:04:32 2011
@@ -39,10 +39,10 @@ import org.apache.lucene.util.StringHelp
 public class Lucene40NormsReader extends NormsReader {
   // this would be replaced by Source/SourceCache in a dv impl.
   // for now we have our own mini-version
-  Map<String,Norm> norms = new HashMap<String,Norm>();
+  final Map<String,Norm> norms = new HashMap<String,Norm>();
   // any .nrm or .sNN files we have open at any time.
   // TODO: just a list, and double-close() separate norms files?
-  Set<IndexInput> openFiles = new MapBackedSet<IndexInput>(new IdentityHashMap<IndexInput,Boolean>());
+  final Set<IndexInput> openFiles = new MapBackedSet<IndexInput>(new IdentityHashMap<IndexInput,Boolean>());
   // points to a singleNormFile
   IndexInput singleNormStream;
   final int maxdoc;
@@ -106,9 +106,7 @@ public class Lucene40NormsReader extends
       success = true;
     } finally {
       if (!success) {
-        if (openFiles != null) {
-          IOUtils.closeWhileHandlingException(openFiles);
-        }
+        IOUtils.closeWhileHandlingException(openFiles);
       }
     }
   }
@@ -123,12 +121,10 @@ public class Lucene40NormsReader extends
   @Override
   public void close() throws IOException {
     try {
-      if (openFiles != null) {
-        IOUtils.close(openFiles);
-      }
+      IOUtils.close(openFiles);
     } finally {
-      norms = null;
-      openFiles = null;
+      norms.clear();
+      openFiles.clear();
     }
   }