You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2010/08/07 23:48:05 UTC

svn commit: r983313 - /lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java

Author: mikemccand
Date: Sat Aug  7 21:48:04 2010
New Revision: 983313

URL: http://svn.apache.org/viewvc?rev=983313&view=rev
Log:
LUCENE-2118: trigger new merges when we flush due to merging currently open doc stores

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

Modified: lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java?rev=983313&r1=983312&r2=983313&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java Sat Aug  7 21:48:04 2010
@@ -3828,6 +3828,7 @@ public class IndexWriter implements Clos
       if (infoStream != null)
         message("now flush at merge");
       doFlush(true, false);
+      updatePendingMerges(1, false);
     }
 
     merge.increfDone = true;
@@ -4010,6 +4011,7 @@ public class IndexWriter implements Clos
             if (infoStream != null)
               message("now flush at mergeMiddle");
             doFlush(true, false);
+            updatePendingMerges(1, false);
           }
         }