With org.zeromq.ZMQ.Event.recv(socket, DONTWAIT), if they is no more event to receive,

it throws an NPE altought the javadoc says it should return null. Fixed.

Also don’t resolve event value for ZMQ_EVENT_MONITOR_STOPPED, it’s a constant.

Author: fbacchella

src/main/java/org/zeromq/ZMQ.java

@@ -4260,6 +4260,9 @@ private Event(int event, Object value, Object resolvedValue, String address)
         public static Event recv(Socket socket, int flags)
         {
             zmq.ZMQ.Event e = zmq.ZMQ.Event.read(socket.base, flags);
+            if (e == null) {
+                return null;
+            }
             Object resolvedValue;
             switch (e.event) {
             case zmq.ZMQ.ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL:
@@ -4280,6 +4283,7 @@ public static Event recv(Socket socket, int flags)
                 break;
             case zmq.ZMQ.ZMQ_EVENT_CONNECT_DELAYED:
             case zmq.ZMQ.ZMQ_EVENT_HANDSHAKE_SUCCEEDED:
+            case zmq.ZMQ.ZMQ_EVENT_MONITOR_STOPPED:
                 resolvedValue = null;
                 break;
             default: