lucene-solr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yo...@apache.org
Subject svn commit: r902582 - /lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java
Date Sun, 24 Jan 2010 15:22:43 GMT
Author: yonik
Date: Sun Jan 24 15:22:43 2010
New Revision: 902582

URL: http://svn.apache.org/viewvc?rev=902582&view=rev
Log:
fix detection of zk enabled instance

Modified:
    lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java

Modified: lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java?rev=902582&r1=902581&r2=902582&view=diff
==============================================================================
--- lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java (original)
+++ lucene/solr/branches/cloud/src/java/org/apache/solr/core/CoreContainer.java Sun Jan 24
15:22:43 2010
@@ -96,11 +96,6 @@
   
   private void initZooKeeper(String zkHost, int zkClientTimeout) {
     // nocommit: perhaps get from solr.xml
-
-    String zkRun = System.getProperty("zkRun");
-    if (zkRun == null && zkHost == null)
-        return;  // not in zk mode
-
     // if zkHost sys property is not set, we are not using ZooKeeper
     String zookeeperHost;
     if(zkHost == null) {
@@ -109,6 +104,11 @@
       zookeeperHost = zkHost;
     }
 
+    String zkRun = System.getProperty("zkRun");
+
+    if (zkRun == null && zookeeperHost == null)
+        return;  // not in zk mode
+
     zkServer = new SolrZkServer(zkRun, zookeeperHost, solrHome, hostPort);
     zkServer.parseConfig();
     zkServer.start();



Mime
View raw message