You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/09/20 01:29:00 UTC

svn commit: r1626366 - in /lucene/dev/branches/branch_5x: ./ lucene/ lucene/core/ lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java

Author: rmuir
Date: Fri Sep 19 23:28:59 2014
New Revision: 1626366

URL: http://svn.apache.org/r1626366
Log:
LUCENE-5958: add logic to merge exc handling as well

Modified:
    lucene/dev/branches/branch_5x/   (props changed)
    lucene/dev/branches/branch_5x/lucene/   (props changed)
    lucene/dev/branches/branch_5x/lucene/core/   (props changed)
    lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java

Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java?rev=1626366&r1=1626365&r2=1626366&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java Fri Sep 19 23:28:59 2014
@@ -435,6 +435,8 @@ public class TestIndexFileDeleter extend
             // suppress only FakeIOException:
             if (exc instanceof RuntimeException && exc.getMessage().equals("fake fail")) {
               // ok to ignore
+            } else if (exc instanceof AlreadyClosedException && exc.getCause() != null && "fake fail".equals(exc.getCause().getMessage())) {
+              // also ok to ignore
             } else {
               super.handleMergeException(exc);
             }