Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7E89010CC7 for ; Mon, 31 Mar 2014 20:17:08 +0000 (UTC) Received: (qmail 10842 invoked by uid 500); 31 Mar 2014 20:17:07 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 10835 invoked by uid 99); 31 Mar 2014 20:17:06 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Mar 2014 20:17:06 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 31 Mar 2014 20:17:05 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 13CD72388A5B; Mon, 31 Mar 2014 20:16:43 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1583439 - /lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Date: Mon, 31 Mar 2014 20:16:43 -0000 To: commits@lucene.apache.org From: mikemccand@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140331201643.13CD72388A5B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: mikemccand Date: Mon Mar 31 20:16:42 2014 New Revision: 1583439 URL: http://svn.apache.org/r1583439 Log: LUCENE-5544: disregard leftover events after rollback has finished 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=1583439&r1=1583438&r2=1583439&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 Mon Mar 31 20:16:42 2014 @@ -2085,7 +2085,6 @@ public class IndexWriter implements Clos rollbackInternal(); } } - assert assertEventQueueAfterClose(); } private void rollbackInternal() throws IOException { @@ -2180,11 +2179,6 @@ public class IndexWriter implements Clos } closed = true; closing = false; - try { - processEvents(false, true); - } finally { - notifyAll(); - } } } }