You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2013/04/23 03:30:55 UTC
svn commit: r1470774 - in /lucene/dev/branches/branch_4x: ./ solr/
solr/core/ solr/core/src/java/org/apache/solr/core/ZkContainer.java
Author: markrmiller
Date: Tue Apr 23 01:30:55 2013
New Revision: 1470774
URL: http://svn.apache.org/r1470774
Log:
SOLR-4749: Record solrcloud attribs even when not in zk mode.
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/ZkContainer.java
Modified: lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/ZkContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/ZkContainer.java?rev=1470774&r1=1470773&r2=1470774&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/ZkContainer.java (original)
+++ lucene/dev/branches/branch_4x/solr/core/src/java/org/apache/solr/core/ZkContainer.java Tue Apr 23 01:30:55 2013
@@ -107,9 +107,6 @@ public class ZkContainer {
}
String zkRun = System.getProperty("zkRun");
-
- if (zkRun == null && zookeeperHost == null)
- return; // not in zk mode
this.zkClientTimeout = zkClientTimeout;
this.hostPort = hostPort;
@@ -118,6 +115,10 @@ public class ZkContainer {
this.leaderVoteWait = leaderVoteWait;
this.distribUpdateConnTimeout = distribUpdateConnTimeout;
this.distribUpdateSoTimeout = distribUpdateSoTimeout;
+
+ if (zkRun == null && zookeeperHost == null)
+ return; // not in zk mode
+
// BEGIN: SOLR-4622: deprecated hardcoded defaults for hostPort & hostContext
if (null == hostPort) {