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/22 14:20:14 UTC

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

Author: rmuir
Date: Mon Sep 22 12:20:13 2014
New Revision: 1626752

URL: http://svn.apache.org/r1626752
Log:
LUCENE-5958: handle illegalstateexception 'checks' by IW as well

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

Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java?rev=1626752&r1=1626751&r2=1626752&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/TestIndexFileDeleter.java Mon Sep 22 12:20:13 2014
@@ -435,7 +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())) {
+            } else if ((exc instanceof AlreadyClosedException || exc instanceof IllegalStateException) 
+                        && exc.getCause() != null && "fake fail".equals(exc.getCause().getMessage())) {
               // also ok to ignore
             } else {
               super.handleMergeException(exc);