You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@lucene.apache.org by ro...@apache.org on 2014/03/28 18:29:40 UTC

svn commit: r1582840 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/core/ConfigSolr.java

Author: romseygeek
Date: Fri Mar 28 17:29:39 2014
New Revision: 1582840

URL: http://svn.apache.org/r1582840
Log:
SOLR-4478: Use CloudConfigSetService with embedded zk server

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/solr/   (props changed)
    lucene/dev/branches/branch_4x/solr/core/   (props changed)
    lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/ConfigSolr.java

Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/ConfigSolr.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/ConfigSolr.java?rev=1582840&r1=1582839&r2=1582840&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/ConfigSolr.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/ConfigSolr.java Fri Mar 28 17:29:39 2014
@@ -245,7 +245,7 @@ public abstract class ConfigSolr {
   }
 
   public ConfigSetService createCoreConfigService(SolrResourceLoader loader, ZkController zkController) {
-    if (getZkHost() != null)
+    if (getZkHost() != null || System.getProperty("zkRun") != null)
       return new CloudConfigSetService(loader, zkController);
     if (hasSchemaCache())
       return new ConfigSetService.SchemaCaching(loader, getConfigSetBaseDirectory());