You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2013/05/09 03:20:50 UTC
svn commit: r1480515 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/core/CoreContainer.java
core/src/test/org/apache/solr/core/TestCoreDiscovery.java
Author: hossman
Date: Thu May 9 01:20:50 2013
New Revision: 1480515
URL: http://svn.apache.org/r1480515
Log:
SOLR-4803: Fixed core discovery mode (ie: new style solr.xml) to treat 'collection1' as the default core name
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/CoreContainer.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1480515&r1=1480514&r2=1480515&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Thu May 9 01:20:50 2013
@@ -108,6 +108,8 @@ Bug Fixes
range in cluster state. This happens when numShards is not a power of two
and router is compositeId. (shalin)
+* SOLR-4803: Fixed core discovery mode (ie: new style solr.xml) to treat
+ 'collection1' as the default core name. (hossman)
Other Changes
----------------------
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=1480515&r1=1480514&r2=1480515&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 Thu May 9 01:20:50 2013
@@ -289,6 +289,7 @@ public class CoreContainer
adminPath = cfg.get(ConfigSolr.CfgProp.SOLR_ADMINPATH, "/admin/cores");
} else {
adminPath = "/admin/cores";
+ defaultCoreName = DEFAULT_DEFAULT_CORE_NAME;
}
zkHost = cfg.get(ConfigSolr.CfgProp.SOLR_ZKHOST, null);
coreLoadThreads = cfg.getInt(ConfigSolr.CfgProp.SOLR_CORELOADTHREADS, CORE_LOAD_THREADS);
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java?rev=1480515&r1=1480514&r2=1480515&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestCoreDiscovery.java Thu May 9 01:20:50 2013
@@ -136,7 +136,8 @@ public class TestCoreDiscovery extends S
CoreContainer cc = init();
try {
- assertNull("defaultCore no longer allowed in solr.xml", cc.getDefaultCoreName());
+ assertEquals(CoreContainer.DEFAULT_DEFAULT_CORE_NAME,
+ cc.getDefaultCoreName());
TestLazyCores.checkInCores(cc, "core1");
TestLazyCores.checkNotInCores(cc, "lazy1", "core2", "collection1");