mirror of https://github.com/apache/lucene.git
remove invalid nocommit
git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1026767 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
f14690e2fd
commit
f89acfbc20
|
@ -512,7 +512,6 @@ public final class SolrCore implements SolrInfoMBean {
|
||||||
this.setName( name );
|
this.setName( name );
|
||||||
resourceLoader = config.getResourceLoader();
|
resourceLoader = config.getResourceLoader();
|
||||||
if (dataDir == null){
|
if (dataDir == null){
|
||||||
// nocommit: why did solrconfig override core descriptor !?
|
|
||||||
if(cd.usingDefaultDataDir()) dataDir = config.getDataDir();
|
if(cd.usingDefaultDataDir()) dataDir = config.getDataDir();
|
||||||
if(dataDir == null) dataDir = cd.getDataDir();
|
if(dataDir == null) dataDir = cd.getDataDir();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue