upgrade to v4.1.7

AUTHORS

@@ -32,6 +32,7 @@ Erik Algell
 Erik Rigtorp
 Fabien Ninoles
 Frank Denis
+Frederic Delechamp
 George Neill
 Gerard Toonstra
 Ghislain Putois

pom.xml

@@ -37,6 +37,11 @@
       <version>4.11</version>
       <scope>test</scope>
     </dependency>
+	<dependency>
+		<groupId>org.abstractj.kalium</groupId>
+		<artifactId>kalium</artifactId>
+		<version>0.5.0</version>
+	</dependency>
   </dependencies>
   <distributionManagement>
     <snapshotRepository>

src/main/java/org/zeromq/ManagedContext.java

@@ -1,20 +1,21 @@
 package org.zeromq;
 
-import zmq.Ctx;
-import zmq.SocketBase;
-import zmq.ZMQ;
-
 import java.util.HashSet;
 import java.util.Set;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
+import zmq.Ctx;
+import zmq.SocketBase;
+import zmq.ZMQ;
+
 // This is to avoid people trying to initialize a Context
 class ManagedContext
 {
     static {
         // Release ManagedSocket resources when catching SIGINT
-        Runtime.getRuntime().addShutdownHook(new Thread() {
+        Runtime.getRuntime().addShutdownHook(new Thread()
+        {
             @Override
             public void run()
             {
@@ -23,8 +24,8 @@ public void run()
         });
     }
 
-    private final Lock lock;
-    private final Ctx ctx;
+    private final Lock            lock;
+    private final Ctx             ctx;
     private final Set<SocketBase> sockets;
 
     private ManagedContext()

src/main/java/org/zeromq/Utils.java

@@ -4,10 +4,12 @@
 
 public class Utils
 {
-    private Utils() {}
+    private Utils()
+    {
+    }
 
     public static int findOpenPort() throws IOException
     {
-        return zmq.Utils.findOpenPort();
+        return zmq.util.Utils.findOpenPort();
     }
 }

src/main/java/org/zeromq/ZActor.java

@@ -243,15 +243,13 @@ public String premiere(final Socket pipe)
         }
 
         @Override
-        public List<Socket> createSockets(final ZContext ctx,
-                final Object[] args)
+        public List<Socket> createSockets(final ZContext ctx, final Object[] args)
         {
             return Collections.emptyList();
         }
 
         @Override
-        public void start(final Socket pipe, final List<Socket> sockets,
-                final ZPoller poller)
+        public void start(final Socket pipe, final List<Socket> sockets, final ZPoller poller)
         {
             // do nothing
         }
@@ -264,16 +262,14 @@ public long looping(Socket pipe, ZPoller poller)
         }
 
         @Override
-        public boolean backstage(final Socket pipe, final ZPoller poller,
-                final int events)
+        public boolean backstage(final Socket pipe, final ZPoller poller, final int events)
         {
             // stop looping
             return false;
         }
 
         @Override
-        public boolean stage(final Socket socket, final Socket pipe,
-                final ZPoller poller, int events)
+        public boolean stage(final Socket socket, final Socket pipe, final ZPoller poller, int events)
         {
             // stop looping
             return false;
@@ -336,16 +332,14 @@ public String premiere(final Socket pipe)
         }
 
         @Override
-        public List<Socket> createSockets(final ZContext ctx,
-                final Object[] args)
+        public List<Socket> createSockets(final ZContext ctx, final Object[] args)
         {
             shadow.createSockets(ctx, args);
             return main.createSockets(ctx, args);
         }
 
         @Override
-        public void start(final Socket pipe, final List<Socket> sockets,
-                final ZPoller poller)
+        public void start(final Socket pipe, final List<Socket> sockets, final ZPoller poller)
         {
             shadow.start(pipe, sockets, poller);
             main.start(pipe, sockets, poller);
@@ -359,16 +353,14 @@ public long looping(Socket pipe, ZPoller poller)
         }
 
         @Override
-        public boolean backstage(final Socket pipe, final ZPoller poller,
-                final int events)
+        public boolean backstage(final Socket pipe, final ZPoller poller, final int events)
         {
             shadow.backstage(pipe, poller, events);
             return main.backstage(pipe, poller, events);
         }
 
         @Override
-        public boolean stage(final Socket socket, final Socket pipe,
-                final ZPoller poller, final int events)
+        public boolean stage(final Socket socket, final Socket pipe, final ZPoller poller, final int events)
         {
             shadow.stage(socket, pipe, poller, events);
             return main.stage(socket, pipe, poller, events);
@@ -446,8 +438,8 @@ public ZActor(final SelectorCreator selector, final Actor actor, final String mo
      * @param args
      *            the optional arguments that will be passed to the distant actor
      */
-    public ZActor(final ZContext context, final SelectorCreator selector,
-            final Actor actor, final String motdelafin, final Object[] args)
+    public ZActor(final ZContext context, final SelectorCreator selector, final Actor actor, final String motdelafin,
+            final Object[] args)
     {
         super(context, selector, new ActorFortune(actor), motdelafin, args);
     }
@@ -470,8 +462,7 @@ public String premiere(Socket mic, Object[] args)
         }
 
         @Override
-        public Star create(ZContext ctx, Socket pipe, Selector sel,
-                int count, Star previous, Object[] args)
+        public Star create(ZContext ctx, Socket pipe, Selector sel, int count, Star previous, Object[] args)
         {
             Star star = new ZActor.Double(ctx, pipe, sel, actor, args);
             return star;
@@ -508,8 +499,7 @@ private static final class Double implements EventsHandler, Star
         private final ZContext context;
 
         // creates a new double
-        public Double(final ZContext ctx, final Socket pipe,
-                final Selector selector, final Actor actor,
+        public Double(final ZContext ctx, final Socket pipe, final Selector selector, final Actor actor,
                 final Object[] args)
         {
             this.context = ctx;

src/main/java/org/zeromq/ZAgent.java

@@ -80,13 +80,6 @@ public interface ZAgent
      */
     boolean sign();
 
-    /**
-     * Forcely destroys the Star.
-     * @deprecated not sure it is useful or recommended
-     */
-    @Deprecated
-    void nova();
-
     /**
      * Returns the socket used for communication.
      * For advanced usage.
@@ -210,12 +203,6 @@ public Socket pipe()
         {
             return pipe;
         }
-
-        @Override
-        public void nova()
-        {
-            pipe.close();
-        }
     }
 
     /**

src/main/java/org/zeromq/ZBeacon.java

@@ -13,17 +13,17 @@
 
 public class ZBeacon
 {
-    public static final long DEFAULT_BROADCAST_INTERVAL = 1000L;
-    public static final String DEFAULT_BROADCAST_HOST = "255.255.255.255";
+    public static final long   DEFAULT_BROADCAST_INTERVAL = 1000L;
+    public static final String DEFAULT_BROADCAST_HOST     = "255.255.255.255";
 
-    private final int port;
-    private InetAddress broadcastInetAddress;
+    private final int             port;
+    private InetAddress           broadcastInetAddress;
     private final BroadcastClient broadcastClient;
     private final BroadcastServer broadcastServer;
-    private final byte[] beacon;
-    private byte[] prefix = {};
-    private long broadcastInterval = DEFAULT_BROADCAST_INTERVAL;
-    private Listener listener = null;
+    private final byte[]          beacon;
+    private byte[]                prefix            = {};
+    private long                  broadcastInterval = DEFAULT_BROADCAST_INTERVAL;
+    private Listener              listener          = null;
 
     public ZBeacon(int port, byte[] beacon)
     {
@@ -52,7 +52,8 @@ public ZBeacon(String host, int port, byte[] beacon, boolean ignoreLocalAddress)
         broadcastClient.setDaemon(true);
     }
 
-    public void setUncaughtExceptionHandlers(Thread.UncaughtExceptionHandler clientHandler, Thread.UncaughtExceptionHandler serverHandler)
+    public void setUncaughtExceptionHandlers(Thread.UncaughtExceptionHandler clientHandler,
+                                             Thread.UncaughtExceptionHandler serverHandler)
     {
         broadcastClient.setUncaughtExceptionHandler(clientHandler);
         broadcastServer.setUncaughtExceptionHandler(serverHandler);
@@ -111,7 +112,7 @@ public interface Listener
      */
     private class BroadcastClient extends Thread
     {
-        private DatagramChannel broadcastChannel;
+        private DatagramChannel         broadcastChannel;
         private final InetSocketAddress broadcastInetSocketAddress;
 
         public BroadcastClient()
@@ -158,8 +159,8 @@ public void run()
      */
     private class BroadcastServer extends Thread
     {
-        private DatagramChannel handle; // Socket for send/recv
-        private final boolean ignoreLocalAddress;
+        private DatagramChannel handle;            // Socket for send/recv
+        private final boolean   ignoreLocalAddress;
 
         public BroadcastServer(boolean ignoreLocalAddress)
         {
@@ -194,10 +195,9 @@ public void run()
 
                     InetAddress senderAddress = ((InetSocketAddress) sender).getAddress();
 
-                    if (ignoreLocalAddress &&
-                                (InetAddress.getLocalHost().getHostAddress().equals(senderAddress.getHostAddress())
-                                         || senderAddress.isAnyLocalAddress()
-                                         || senderAddress.isLoopbackAddress())) {
+                    if (ignoreLocalAddress
+                            && (InetAddress.getLocalHost().getHostAddress().equals(senderAddress.getHostAddress())
+                                    || senderAddress.isAnyLocalAddress() || senderAddress.isLoopbackAddress())) {
                         continue;
                     }
 

src/main/java/org/zeromq/ZContext.java

@@ -23,7 +23,7 @@ public class ZContext implements Closeable
     /**
      * Reference to underlying Context object
      */
-    private volatile Context context;  //  Created lazily, use getContext() to access.
+    private volatile Context context; //  Created lazily, use getContext() to access.
 
     /**
      * List of sockets managed by this ZContext

src/main/java/org/zeromq/ZFrame.java

@@ -20,8 +20,8 @@
 
 public class ZFrame
 {
-    public static final int MORE  =   ZMQ.SNDMORE;
-    public static final int REUSE =   128;     // no effect at java
+    public static final int MORE     = ZMQ.SNDMORE;
+    public static final int REUSE    = 128;         // no effect at java
     public static final int DONTWAIT = ZMQ.DONTWAIT;
 
     private boolean more;
@@ -367,7 +367,7 @@ public static ZFrame recvFrame(Socket socket)
     public static ZFrame recvFrame(Socket socket, int flags)
     {
         ZFrame f = new ZFrame();
-        byte [] data = f.recv(socket, flags);
+        byte[] data = f.recv(socket, flags);
         if (data == null) {
             return null;
         }
@@ -382,7 +382,7 @@ public void print(String prefix)
         if (prefix != null) {
             pw.printf("%s", prefix);
         }
-        byte []data = getData();
+        byte[] data = getData();
         int size = size();
 
         boolean isBin = false;