You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2012/07/19 16:04:17 UTC
svn commit: r1363341 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
Author: markrmiller
Date: Thu Jul 19 14:04:16 2012
New Revision: 1363341
URL: http://svn.apache.org/viewvc?rev=1363341&view=rev
Log:
catch throwable for tests (assert fails) - not just exception
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java?rev=1363341&r1=1363340&r2=1363341&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java Thu Jul 19 14:04:16 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