svn commit: r1237200 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java

[ma...@apache.org]

Author: markrmiller
Date: Sun Jan 29 03:41:37 2012
New Revision: 1237200

URL: http://svn.apache.org/viewvc?rev=1237200&view=rev
Log:
if there is an exception when closing the writer, log it and keep closing

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=1237200&r1=1237199&r2=1237200&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 Sun Jan 29 03:41:37 2012
@@ -21,11 +21,15 @@ import java.io.IOException;
 
 import org.apache.lucene.index.IndexWriter;
 import org.apache.solr.cloud.RecoveryStrategy;
+import org.apache.solr.common.SolrException;
 import org.apache.solr.core.DirectoryFactory;
 import org.apache.solr.core.SolrCore;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public final class DefaultSolrCoreState extends SolrCoreState {
- 
+  public static Logger log = LoggerFactory.getLogger(DefaultSolrCoreState.class);
+  
   private final Object recoveryLock = new Object();
   private int refCnt = 1;
   private SolrIndexWriter indexWriter = null;
@@ -62,10 +66,14 @@ public final class DefaultSolrCoreState 
     synchronized (this) {
       refCnt--;
       if (refCnt == 0) {
-        if (closer != null) {
-          closer.closeWriter(indexWriter);
-        } else if (indexWriter != null) {
-          indexWriter.close();
+        try {
+          if (closer != null) {
+            closer.closeWriter(indexWriter);
+          } else if (indexWriter != null) {
+            indexWriter.close();
+          }
+        } catch (Throwable t) {
+          SolrException.log(log, t);
         }
         directoryFactory.close();
         closed = true;