Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-1722: small bug - defaultCoreName is looked for at /solr, but should be /solr/cores - also, defaultCoreName should really not default to DEFAULT_DEFAULT_CORENAME 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@919444 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Mark Robert Miller 2010-03-05 15:18:00 +00:00
parent 6c10ee2c03
commit ab9a5ca386
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/java/org/apache/solr/core/CoreContainer.java
View File

@ -70,7 +70,7 @@ public class CoreContainer
protected String solrHome;
protected String solrConfigFilenameOverride;
private String defaultCoreName = DEFAULT_DEFAULT_CORE_NAME;
private String defaultCoreName = "";
public CoreContainer() {
solrHome = SolrResourceLoader.locateSolrHome();
@ -212,7 +212,7 @@ public class CoreContainer
solrHome = loader.getInstanceDir();
try {
Config cfg = new Config(loader, null, cfgis, null);
String dcoreName = cfg.get("solr/@defaultCoreName", null);
String dcoreName = cfg.get("solr/cores/@defaultCoreName", null);
if(dcoreName != null) {
defaultCoreName = dcoreName;
}
@ -573,6 +573,10 @@ public class CoreContainer
return coreAdminHandler;
}
public String getDefaultCoreName() {
return defaultCoreName;
}
// all of the following properties aren't synchronized
// but this should be OK since they normally won't be changed rapidly
public boolean isPersistent() {
@ -773,7 +777,7 @@ public class CoreContainer
}
private static final String DEF_SOLR_XML ="<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n" +
"<solr persistent=\"false\">\n" +
" <cores adminPath=\"/admin/cores\">\n" +
" <cores adminPath=\"/admin/cores\" defaultCoreName=\"" + DEFAULT_DEFAULT_CORE_NAME + "\">\n" +
" <core name=\""+ DEFAULT_DEFAULT_CORE_NAME + "\" instanceDir=\".\" />\n" +
" </cores>\n" +
"</solr>";