ZOOKEEPER-1256: ClientPortBindTest is failing on Mac OS X (Camille vi…

…a phunt) git-svn-id: https://svn.apache.org/repos/asf/zookeeper/trunk@1754582 13f79535-47bb-0310-9956-ffa450edef68
apache · Jul 29, 2016 · beb1dd6 · beb1dd6
1 parent fa01aff
commit beb1dd6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -335,6 +335,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-2024 Major throughput improvement with mixed workloads (Kfir Lev-Ari via shralex)
 

diff --git a/src/java/test/org/apache/zookeeper/test/ClientPortBindTest.java b/src/java/test/org/apache/zookeeper/test/ClientPortBindTest.java
@@ -60,8 +60,12 @@ public void testBindByAddress() throws Exception {
             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;
+                    }
                 }
             }
         }