svn commit: r1476351 - in /lucene/dev/branches/lucene_solr_4_3: ./ solr/ solr/core/ solr/core/src/java/org/apache/solr/cloud/ZkController.java

[ma...@apache.org]

Author: markrmiller
Date: Fri Apr 26 19:23:19 2013
New Revision: 1476351

URL: http://svn.apache.org/r1476351
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/branches/lucene_solr_4_3/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/core/   (props changed)
    lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/cloud/ZkController.java

Modified: lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/cloud/ZkController.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/cloud/ZkController.java?rev=1476351&r1=1476350&r2=1476351&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/cloud/ZkController.java (original)
+++ lucene/dev/branches/lucene_solr_4_3/solr/core/src/java/org/apache/solr/cloud/ZkController.java Fri Apr 26 19:23:19 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();