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 2012/03/20 08:05:18 UTC

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

Author: phunt
Date: Tue Mar 20 07:05:17 2012
New Revision: 1302789

URL: http://svn.apache.org/viewvc?rev=1302789&view=rev
Log:
ZOOKEEPER-1256. ClientPortBindTest is failing on Mac OS X (Daniel Gómez Ferro 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=1302789&r1=1302788&r2=1302789&view=diff
==============================================================================
--- zookeeper/branches/branch-3.4/CHANGES.txt (original)
+++ zookeeper/branches/branch-3.4/CHANGES.txt Tue Mar 20 07:05:17 2012
@@ -34,8 +34,11 @@ BUGFIXES:
   ZOOKEEPER-1384. test-cppunit overrides LD_LIBRARY_PATH and fails if
   gcc is in non-standard location (Jay Shrauner via phunt)
   
-  ZOOKEEPER-1419. Leader election never settles for a 5-node cluster (flavio via camille)
+  ZOOKEEPER-1419. Leader election never settles for a 5-node cluster
+  (flavio via camille)
   
+  ZOOKEEPER-1256. ClientPortBindTest is failing on Mac OS X
+  (Daniel GÃ³mez Ferro via phunt)
    
 IMPROVEMENTS:
 

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=1302789&r1=1302788&r2=1302789&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 Tue Mar 20 07:05:17 2012
@@ -62,8 +62,6 @@ public class ClientPortBindTest extends 
                 Enumeration<InetAddress> addrs = i.getInetAddresses();
                 if (addrs.hasMoreElements()) {
                     bindAddress = addrs.nextElement().getHostAddress();
-                    // handle the ipv6 scope_id - ie remove it
-                    bindAddress = bindAddress.split("%")[0];
                 }
             }
         }