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 2011/05/05 21:23:05 UTC
svn commit: r1099928 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/ lucene/src/java/org/apache/lucene/index/IndexWriter.java
solr/
Author: mikemccand
Date: Thu May 5 19:23:05 2011
New Revision: 1099928
URL: http://svn.apache.org/viewvc?rev=1099928&view=rev
Log:
LUCENE-2918: fix thread safety bug w/ assert statement (back port from trunk)
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/branch_3x/solr/ (props changed)
Modified: lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java?rev=1099928&r1=1099927&r2=1099928&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java Thu May 5 19:23:05 2011
@@ -4025,10 +4025,10 @@ public class IndexWriter implements Clos
final SegmentReader clone = (SegmentReader) reader.clone(true);
merge.readerClones.add(clone);
- if (reader.numDocs() > 0) {
+ if (clone.numDocs() > 0) {
merger.add(clone);
+ totDocCount += clone.numDocs();
}
- totDocCount += clone.numDocs();
segUpto++;
}