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/01/27 01:40:00 UTC
svn commit: r1063934 -
/lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java
Author: mikemccand
Date: Thu Jan 27 00:39:59 2011
New Revision: 1063934
URL: http://svn.apache.org/viewvc?rev=1063934&view=rev
Log:
LUCENE-2680: deletes were being double-applied
Modified:
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/index/IndexWriter.java
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=1063934&r1=1063933&r2=1063934&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 Jan 27 00:39:59 2011
@@ -3736,10 +3736,6 @@ public class IndexWriter implements Clos
final synchronized void mergeInit(MergePolicy.OneMerge merge) throws IOException {
boolean success = false;
try {
- // Lock order: IW -> BD
- if (bufferedDeletes.applyDeletes(readerPool, segmentInfos, merge.segments)) {
- checkpoint();
- }
_mergeInit(merge);
success = true;
} finally {
@@ -3770,6 +3766,11 @@ public class IndexWriter implements Clos
if (merge.isAborted())
return;
+ // Lock order: IW -> BD
+ if (bufferedDeletes.applyDeletes(readerPool, segmentInfos, merge.segments)) {
+ checkpoint();
+ }
+
boolean hasVectors = false;
for (SegmentInfo sourceSegment : merge.segments) {
if (sourceSegment.getHasVectors()) {