You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2014/01/09 21:31:41 UTC
svn commit: r1556942 -
/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
Author: simonw
Date: Thu Jan 9 20:31:40 2014
New Revision: 1556942
URL: http://svn.apache.org/r1556942
Log:
LUCENE-5390: Loosen assert in IW on pending event after close
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
Modified: lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1556942&r1=1556941&r2=1556942&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Thu Jan 9 20:31:40 2014
@@ -930,10 +930,20 @@ public class IndexWriter implements Clos
closeInternal(waitForMerges, true);
}
}
- assert eventQueue.isEmpty();
+ assert assertEventQueueAfterClose();
}
}
+ private boolean assertEventQueueAfterClose() {
+ if (eventQueue.isEmpty()) {
+ return true;
+ }
+ for (Event e : eventQueue) {
+ assert e instanceof DocumentsWriter.MergePendingEvent : e;
+ }
+ return true;
+ }
+
// Returns true if this thread should attempt to close, or
// false if IndexWriter is now closed; else, waits until
// another thread finishes closing
@@ -2022,7 +2032,7 @@ public class IndexWriter implements Clos
rollbackInternal();
}
}
- assert eventQueue.isEmpty() : eventQueue;
+ assert assertEventQueueAfterClose();
}
private void rollbackInternal() throws IOException {