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/10/22 19:57:38 UTC
svn commit: r1026431 -
/lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/IndexWriter.java
Author: mikemccand
Date: Fri Oct 22 17:57:38 2010
New Revision: 1026431
URL: http://svn.apache.org/viewvc?rev=1026431&view=rev
Log:
LUCENE-2618: revert
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=1026431&r1=1026430&r2=1026431&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 Fri Oct 22 17:57:38 2010
@@ -3662,7 +3662,7 @@ public class IndexWriter implements Clos
// This merge (and, generally, any change to the
// segments) may now enable new merges, so we call
// merge policy & update pending merges.
- if (success && !merge.isAborted() && (merge.optimize || (!closed && !closing))) {
+ if (success && !merge.isAborted() && !closed && !closing) {
updatePendingMerges(merge.maxNumSegmentsOptimize, merge.optimize);
}
}