You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2013/03/29 15:55:08 UTC
svn commit: r1462495 -
/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
Author: erick
Date: Fri Mar 29 14:55:07 2013
New Revision: 1462495
URL: http://svn.apache.org/r1462495
Log:
SOLR-4549 - Hardening tests after SOLR-4196
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java?rev=1462495&r1=1462494&r2=1462495&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java Fri Mar 29 14:55:07 2013
@@ -1454,10 +1454,13 @@ class CoreMaps {
core.close();
} catch (Throwable t) {
SolrException.log(CoreContainer.log, "Error shutting down core", t);
+ } finally {
+ synchronized (locker) {
+ cores.remove(coreName);
+ }
}
}
}
- cores.clear();
for (String coreName : transientNames) {
SolrCore core = transientCores.get(coreName);
@@ -1466,10 +1469,13 @@ class CoreMaps {
core.close();
} catch (Throwable t) {
SolrException.log(CoreContainer.log, "Error shutting down core", t);
+ } finally {
+ synchronized (locker) {
+ transientCores.remove(coreName);
+ }
}
}
}
- transientCores.clear();
// We might have some cores that we were _thinking_ about shutting down, so take care of those too.
for (SolrCore core : pendingToClose) {
@@ -1477,9 +1483,12 @@ class CoreMaps {
core.close();
} catch (Throwable t) {
SolrException.log(CoreContainer.log, "Error shutting down core", t);
+ } finally {
+ synchronized (locker) {
+ pendingCloses.remove(core);
+ }
}
}
-
}
protected void addCoresToList(ArrayList<SolrCoreState> coreStates) {