lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From markrmil...@apache.org
Subject svn commit: r1363333 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
Date Thu, 19 Jul 2012 13:50:32 GMT
Author: markrmiller
Date: Thu Jul 19 13:50:32 2012
New Revision: 1363333

URL: http://svn.apache.org/viewvc?rev=1363333&view=rev
Log:
catch throwable for tests (assert fails) - not just exception

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java?rev=1363333&r1=1363332&r2=1363333&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java Thu
Jul 19 13:50:32 2012
@@ -94,15 +94,15 @@ public final class DefaultSolrCoreState 
       } catch (InterruptedException e) {}
     }
     
-    if (indexWriter != null) {
-      try {
-        indexWriter.close();
-      } catch (Exception e) {
-        SolrException.log(log, "Error closing old IndexWriter", e);
-      }
-    }
-    
     try {
+      if (indexWriter != null) {
+        try {
+          indexWriter.close();
+        } catch (Throwable t) {
+          SolrException.log(log, "Error closing old IndexWriter", t);
+        }
+      }
+      
       indexWriter = createMainIndexWriter(core, "DirectUpdateHandler2", false,
           true);
       // we need to null this so it picks up the new writer next get call



Mime
View raw message