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/15 23:30:14 UTC

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

Author: markrmiller
Date: Sun Jul 15 21:30:13 2012
New Revision: 1361805

URL: http://svn.apache.org/viewvc?rev=1361805&view=rev
Log:
SOLR-3620: check if shutdown after wait so that any threads that were waiting bail rather than starting a recovery

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=1361805&r1=1361804&r2=1361805&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 Jul 15 21:30:13 2012
@@ -138,6 +138,11 @@ public final class DefaultSolrCoreState 
         } catch (InterruptedException e) {
 
         }
+        // check again for those that were waiting
+        if (cc.isShutDown()) {
+          log.warn("Skipping recovery because Solr is shutdown");
+          return;
+        }
         if (closed) return;
       }