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/16 01:03:10 UTC
svn commit: r1361837 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/core/
solr/core/src/java/org/apache/solr/update/DefaultSolrCoreState.java
Author: markrmiller
Date: Sun Jul 15 23:03:09 2012
New Revision: 1361837
URL: http://svn.apache.org/viewvc?rev=1361837&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/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/solr/ (props changed)
lucene/dev/branches/branch_4x/solr/core/ (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=1361837&r1=1361836&r2=1361837&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 Sun Jul 15 23:03:09 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;
}