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/26 21:11:04 UTC

svn commit: r1476347 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java

Author: markrmiller
Date: Fri Apr 26 19:10:31 2013
New Revision: 1476347

URL: http://svn.apache.org/r1476347
Log:
SOLR-4754: our config parser seems to have been changed to return "" when it used to return null on an empty value and broke default host detection

Modified:
    lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1476347&r1=1476346&r2=1476347&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/cloud/ZkController.java Fri Apr 26 19:10:31 2013
@@ -405,7 +405,7 @@ public final class ZkController {
   // input can be null, host, or url_prefix://host
   private String getHostAddress(String host) throws IOException {
 
-    if (host == null) {
+    if (host == null || host.length() == 0) {
       String hostaddress;
       try {
         hostaddress = InetAddress.getLocalHost().getHostAddress();