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 2012/10/04 22:25:09 UTC

svn commit: r1394248 - /lucene/dev/branches/ghost_of_4456/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java

Author: mikemccand
Date: Thu Oct  4 20:25:09 2012
New Revision: 1394248

URL: http://svn.apache.org/viewvc?rev=1394248&view=rev
Log:
LUCENE-4456: refresh merge segment on merge exc

Modified:
    lucene/dev/branches/ghost_of_4456/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java

Modified: lucene/dev/branches/ghost_of_4456/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/ghost_of_4456/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1394248&r1=1394247&r2=1394248&view=diff
==============================================================================
--- lucene/dev/branches/ghost_of_4456/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/ghost_of_4456/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Thu Oct  4 20:25:09 2012
@@ -3724,7 +3724,18 @@ public class IndexWriter implements Clos
       merge.checkAborted(directory);
 
       // This is where all the work happens:
-      MergeState mergeState = merger.merge();
+      MergeState mergeState;
+      boolean success3 = false;
+      try {
+        mergeState = merger.merge();
+        success3 = true;
+      } finally {
+        if (!success3) {
+          synchronized(this) {  
+            deleter.refresh(merge.info.info.name);
+          }
+        }
+      }
       assert mergeState.segmentInfo == merge.info.info;
       merge.info.info.setFiles(new HashSet<String>(dirWrapper.getCreatedFiles()));