svn commit: r1556947 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/core/ lucene/core/src/java/org/apache/lucene/index/IndexWriter.java

[si...@apache.org]

Author: simonw
Date: Thu Jan  9 20:50:00 2014
New Revision: 1556947

URL: http://svn.apache.org/r1556947
Log:
LUCENE-5390: Loosen assert in IW on pending event after close

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/   (props changed)
    lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java

Modified: lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1556947&r1=1556946&r2=1556947&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/branch_4x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Thu Jan  9 20:50:00 2014
@@ -931,10 +931,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
@@ -2023,7 +2033,7 @@ public class IndexWriter implements Clos
         rollbackInternal();
       }
     }
-    assert eventQueue.isEmpty() : eventQueue;
+    assert assertEventQueueAfterClose();
   }
 
   private void rollbackInternal() throws IOException {