summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@fastmq.commkdir>2009-09-16 14:03:42 +0200
committerMartin Sustrik <sustrik@fastmq.commkdir>2009-09-16 14:03:42 +0200
commita71d00288008b7ed1dc91b6ad3d5fdf25a5e683e (patch)
treec4c1dde7b4cb638c88fc92647bdae836ab8216ea /java
parent4631fde7e385ea31e85f41290614afb9bda391c9 (diff)
parent7a5db6041f4f11ed502fa7446da900509dedb00f (diff)
Merge branch 'master' of git@github.com:sustrik/zeromq2
Diffstat (limited to 'java')
-rw-r--r--java/Socket.cpp1
-rw-r--r--java/org/zmq/Socket.java1
2 files changed, 2 insertions, 0 deletions
diff --git a/java/Socket.cpp b/java/Socket.cpp
index 2a2f420..2274535 100644
--- a/java/Socket.cpp
+++ b/java/Socket.cpp
@@ -98,6 +98,7 @@ JNIEXPORT void JNICALL Java_org_zmq_Socket_setsockopt__IJ (JNIEnv *env,
case ZMQ_AFFINITY:
case ZMQ_RATE:
case ZMQ_RECOVERY_IVL:
+ case ZMQ_MCAST_LOOP:
{
void *s = (void*) env->GetLongField (obj, socket_handle_fid);
assert (s);
diff --git a/java/org/zmq/Socket.java b/java/org/zmq/Socket.java
index 0d96c71..501bc16 100644
--- a/java/org/zmq/Socket.java
+++ b/java/org/zmq/Socket.java
@@ -44,6 +44,7 @@ public class Socket
public static final int UNSUBSCRIBE = 7;
public static final int RATE = 8;
public static final int RECOVERY_IVL = 9;
+ public static final int MCAST_LOOP = 10;
/**
* Class constructor.