You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zookeeper.apache.org by ph...@apache.org on 2016/07/29 23:03:58 UTC

svn commit: r1754584 - in /zookeeper/branches/branch-3.4: CHANGES.txt src/java/test/org/apache/zookeeper/test/ClientPortBindTest.java

Author: phunt
Date: Fri Jul 29 23:03:58 2016
New Revision: 1754584

URL: http://svn.apache.org/viewvc?rev=1754584&view=rev
Log:
ZOOKEEPER-1256: ClientPortBindTest is failing on Mac OS X (Camille via phunt)

Modified:
    zookeeper/branches/branch-3.4/CHANGES.txt
    zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/ClientPortBindTest.java

Modified: zookeeper/branches/branch-3.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/CHANGES.txt?rev=1754584&r1=1754583&r2=1754584&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Fri Jul 29 23:03:58 2016
@@ -39,6 +39,9 @@ BUGFIXES:
   ZOOKEEPER-2477: documentation should refer to Java cli shell and not
   C cli shell (Abraham Fine via phunt)
 
+  ZOOKEEPER-1256: ClientPortBindTest is failing on Mac OS X
+  (Camille via phunt)
+
 IMPROVEMENTS:
 
   ZOOKEEPER-2240 Make the three-node minimum more explicit in 

Modified: zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/ClientPortBindTest.java
URL: http://svn.apache.org/viewvc/zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/ClientPortBindTest.java?rev=1754584&r1=1754583&r2=1754584&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/ClientPortBindTest.java (original)
+++ zookeeper/branches/branch-3.4/src/java/test/org/apache/zookeeper/test/ClientPortBindTest.java Fri Jul 29 23:03:58 2016
@@ -60,8 +60,12 @@ public class ClientPortBindTest extends
             NetworkInterface i = intfs.nextElement();
             if (i.isLoopback()) {
                 Enumeration<InetAddress> addrs = i.getInetAddresses();
-                if (addrs.hasMoreElements()) {
-                    bindAddress = addrs.nextElement().getHostAddress();
+                while (addrs.hasMoreElements()) {
+                    InetAddress a = addrs.nextElement();
+                    if(a.isLoopbackAddress()) {
+                        bindAddress = a.getHostAddress();
+                        break;
+                    }
                 }
             }
         }