Bug#584378: zkclient: Patch that fixes the FTBFS (taken from upstream)

[Fabrice Coutadeur]

Package: zkclient
Version: 0.1.0+dfsg1-1
Severity: normal
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu natty ubuntu-patch

*** /tmp/tmpxG1d10
In Ubuntu, we've applied the attached patch to achieve the following:

  * src/main/java/org/I0Itec/zkclient/ZkServer.java: patched for ZK 3.3.x.
    Patch taken from Upstream git repository (commit 4712ee3fab9fec2f7415).
    This fixes the FTBFS.

We thought you might be interested in doing the same. 


-- System Information:
Debian Release: squeeze/sid
  APT prefers maverick-updates
  APT policy: (500, 'maverick-updates'), (500, 'maverick-security'), (500, 
'maverick-proposed'), (500, 'maverick')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.35-22-generic (SMP w/2 CPU cores)
Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

--- zkclient-0.1.0+dfsg1.orig/src/main/java/org/I0Itec/zkclient/ZkServer.java
+++ zkclient-0.1.0+dfsg1/src/main/java/org/I0Itec/zkclient/ZkServer.java
@@ -17,6 +17,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.net.InetSocketAddress;
 import java.util.Arrays;
 
 import javax.annotation.PostConstruct;
@@ -124,7 +125,7 @@
     private void startSingleZkServer(final int tickTime, final File dataDir, final File dataLogDir, final int port) {
         try {
             _zk = new ZooKeeperServer(dataDir, dataLogDir, tickTime);
-            _nioFactory = new NIOServerCnxn.Factory(port);
+            _nioFactory = new NIOServerCnxn.Factory(new InetSocketAddress(port));
             _nioFactory.startup(_zk);
         } catch (IOException e) {
             throw new ZkException("Unable to start single ZooKeeper server.", e);