svn commit: r1221840 - /lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentReader.java

[us...@apache.org]

Author: uschindler
Date: Wed Dec 21 19:19:32 2011
New Revision: 1221840

URL: http://svn.apache.org/viewvc?rev=1221840&view=rev
Log:
LUCENE-3631: Remove useless nullcheck; don't call doClose from ctor (it's protected and this violates style)

Modified:
    lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentReader.java

Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentReader.java?rev=1221840&r1=1221839&r2=1221840&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentReader.java Wed Dec 21 19:19:32 2011
@@ -57,9 +57,9 @@ public final class SegmentReader extends
    */
   public SegmentReader(SegmentInfo si, int termInfosIndexDivisor, IOContext context) throws IOException {
     this.si = si;
+    core = new SegmentCoreReaders(this, si.dir, si, context, termInfosIndexDivisor);
     boolean success = false;
     try {
-      core = new SegmentCoreReaders(this, si.dir, si, context, termInfosIndexDivisor);
       if (si.hasDeletions()) {
         // NOTE: the bitvector is stored using the regular directory, not cfs
         liveDocs = new BitVector(directory(), si.getDelFileName(), new IOContext(IOContext.READ, true));
@@ -77,7 +77,7 @@ public final class SegmentReader extends
       // of things that were opened so that we don't have to
       // wait for a GC to do so.
       if (!success) {
-        doClose();
+        core.decRef();
       }
     }
   }
@@ -154,9 +154,7 @@ public final class SegmentReader extends
   @Override
   protected void doClose() throws IOException {
     //System.out.println("SR.close seg=" + si);
-    if (core != null) {
-      core.decRef();
-    }
+    core.decRef();
   }
 
   @Override