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 2014/05/16 17:42:33 UTC
svn commit: r1595240 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
Author: mikemccand
Date: Fri May 16 15:42:33 2014
New Revision: 1595240
URL: http://svn.apache.org/r1595240
Log:
only throw IOExc if merge really hit an exception
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=1595240&r1=1595239&r2=1595240&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 Fri May 16 15:42:33 2014
@@ -1912,7 +1912,10 @@ public class IndexWriter implements Clos
if (pendingMerges.contains(merge) || runningMerges.contains(merge)) {
running = true;
}
- throw new IOException("background merge hit exception: " + merge.segString(directory), merge.getException());
+ Throwable t = merge.getException();
+ if (t != null) {
+ throw new IOException("background merge hit exception: " + merge.segString(directory), merge.getException());
+ }
}
// If any of our merges are still running, wait: