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 2013/10/14 12:12:20 UTC

svn commit: r1531836 - /lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java

Author: mikemccand
Date: Mon Oct 14 10:12:20 2013
New Revision: 1531836

URL: http://svn.apache.org/r1531836
Log:
LUCENE-5263: if merge hits exc when releasing merged reader then drop changes and remove it from the pool, since the merge will be aborted

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=1531836&r1=1531835&r2=1531836&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 Oct 14 10:12:20 2013
@@ -3357,13 +3357,22 @@ public class IndexWriter implements Clos
     assert merge.info.info.getDocCount() != 0 || keepFullyDeletedSegments || dropSegment;
 
     if (mergedDeletes != null) {
-      if (dropSegment) {
-        mergedDeletes.dropChanges();
-      }
       // Pass false for assertInfoLive because the merged
       // segment is not yet live (only below do we commit it
       // to the segmentInfos):
-      readerPool.release(mergedDeletes, false);
+      boolean success = false;
+      try {
+        if (dropSegment) {
+          mergedDeletes.dropChanges();
+        }
+        readerPool.release(mergedDeletes, false);
+        success = true;
+      } finally {
+        if (!success) {
+          mergedDeletes.dropChanges();
+          readerPool.drop(merge.info);
+        }
+      }
     }
 
     // Must do this after readerPool.release, in case an