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 2014/01/19 21:34:52 UTC
svn commit: r1559578 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/core/CoreContainer.java
Author: markrmiller
Date: Sun Jan 19 20:34:52 2014
New Revision: 1559578
URL: http://svn.apache.org/r1559578
Log:
SOLR-5645: A SolrCore reload via the CoreContainer will try and register in zk again with the new SolrCore.
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1559578&r1=1559577&r2=1559578&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Sun Jan 19 20:34:52 2014
@@ -386,6 +386,9 @@ Bug Fixes
updates meant for replicas to be lost. (Markus Jelsma, Timothy Potter,
Joel Bernstein, Mark Miller)
+* SOLR-5645: A SolrCore reload via the CoreContainer will try and register in
+ zk again with the new SolrCore. (Mark Miller)
+
Optimizations
----------------------
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=1559578&r1=1559577&r2=1559578&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 Sun Jan 19 20:34:52 2014
@@ -719,7 +719,7 @@ public class CoreContainer {
SolrCore newCore = core.reload(solrLoader, core);
// keep core to orig name link
solrCores.removeCoreToOrigName(newCore, core);
- registerCore(false, name, newCore, false);
+ registerCore(false, name, newCore, false, false);
} finally {
solrCores.removeFromPendingOps(name);
}