You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2011/05/19 23:12:54 UTC

svn commit: r1125108 - /lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentMerger.java

Author: simonw
Date: Thu May 19 21:12:54 2011
New Revision: 1125108

URL: http://svn.apache.org/viewvc?rev=1125108&view=rev
Log:
LUCENE-3125: SegmentMerger was closing in-use DocValues after merge

Modified:
    lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentMerger.java

Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentMerger.java?rev=1125108&r1=1125107&r2=1125108&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentMerger.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentMerger.java Thu May 19 21:12:54 2011
@@ -575,15 +575,12 @@ final class SegmentMerger {
       mergeState.multiDeletedDocs = new MultiBits(perDocBits, perDocBitsStarts);
       final PerDocConsumer docsConsumer = codec
           .docsConsumer(new PerDocWriteState(segmentWriteState));
-      MultiPerDocValues multiPerDocValues = null; 
       try {
-        multiPerDocValues = new MultiPerDocValues(perDocProducers
+        final MultiPerDocValues multiPerDocValues = new MultiPerDocValues(perDocProducers
             .toArray(PerDocValues.EMPTY_ARRAY), perDocSlices
             .toArray(ReaderUtil.Slice.EMPTY_ARRAY));
         docsConsumer.merge(mergeState, multiPerDocValues);
       } finally {
-        if (multiPerDocValues != null)
-          multiPerDocValues.close();
         docsConsumer.close();
       }
     }