svn commit: r1198390 - /lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentMerger.java

[rm...@apache.org]

Author: rmuir
Date: Sun Nov  6 15:20:25 2011
New Revision: 1198390

URL: http://svn.apache.org/viewvc?rev=1198390&view=rev
Log:
LUCENE-2621: remove instance variable

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

Modified: lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentMerger.java?rev=1198390&r1=1198389&r2=1198390&view=diff
==============================================================================
--- lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentMerger.java (original)
+++ lucene/dev/branches/lucene2621/lucene/src/java/org/apache/lucene/index/SegmentMerger.java Sun Nov  6 15:20:25 2011
@@ -58,8 +58,6 @@ final class SegmentMerger {
   private final List<MergeState.IndexReaderAndLiveDocs> readers = new ArrayList<MergeState.IndexReaderAndLiveDocs>();
   private final FieldInfos fieldInfos;
 
-  private int mergedDocs;
-
   private final MergeState.CheckAbort checkAbort;
 
   /** Maximum number of contiguous documents to bulk-copy
@@ -133,13 +131,13 @@ final class SegmentMerger {
     // IndexWriter.close(false) takes to actually stop the
     // threads.
 
-    mergedDocs = mergeFields();
-    mergeTerms();
+    final int mergedDocs = mergeFields();
+    mergeTerms(mergedDocs);
     mergePerDoc();
     mergeNorms();
 
     if (fieldInfos.hasVectors()) {
-      mergeVectors();
+      mergeVectors(mergedDocs);
     }
     // write FIS once merge is done. IDV might change types or drops fields
     fieldInfos.write(directory, segment + "." + IndexFileNames.FIELD_INFOS_EXTENSION);
@@ -373,7 +371,7 @@ final class SegmentMerger {
    * Merge the TermVectors from each of the segments into the new one.
    * @throws IOException
    */
-  private final void mergeVectors() throws IOException {
+  private final void mergeVectors(int mergedDocs) throws IOException {
     TermVectorsWriter termVectorsWriter = new TermVectorsWriter(directory, segment, fieldInfos, context);
 
     try {
@@ -484,7 +482,7 @@ final class SegmentMerger {
     }
   }
 
-  private final void mergeTerms() throws CorruptIndexException, IOException {
+  private final void mergeTerms(int mergedDocs) throws CorruptIndexException, IOException {
 
     // Let CodecProvider decide which codec will be used to write
     // the new segment: