[lucene-solr] 01/02: also remove merge from pending

[si...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

simonw pushed a commit to branch jira/lucene-8962
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 56351688673a7ce35cfa57a3bbdf9bb53a79e3b9
Author: Simon Willnauer <si...@apache.org>
AuthorDate: Fri Jun 26 15:18:53 2020 +0200

    also remove merge from pending
---
 lucene/core/src/java/org/apache/lucene/index/IndexWriter.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
index c7e9f90..0fc058f 100644
--- a/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
@@ -3387,9 +3387,11 @@ public class IndexWriter implements Closeable, TwoPhaseCommit, Accountable,
         if (closeReaders) {
           IOUtils.applyToAll(onCommitMerges.merges, merge -> {
             // that merge is broken we need to clean up after it - it's fine we still have the IW lock to do this
-            assert pendingMerges.contains(merge) : "merge should be pending but isn't: " + merge.segString();
+            boolean removed = pendingMerges.remove(merge);
+            assert removed: "merge should be pending but isn't: " + merge.segString();
             abortOneMerge(merge);
             mergeFinish(merge);
+
           });
         }
       }