diff options
Diffstat (limited to 'java/src/IceInternal/UdpTransceiver.java')
| -rw-r--r-- | java/src/IceInternal/UdpTransceiver.java | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java index c23a695c79a..14349800477 100644 --- a/java/src/IceInternal/UdpTransceiver.java +++ b/java/src/IceInternal/UdpTransceiver.java @@ -257,7 +257,6 @@ final class UdpTransceiver implements Transceiver _traceLevels = instance.traceLevels(); _logger = instance.initializationData().logger; _stats = instance.initializationData().stats; - _incoming = false; _connect = true; _warn = instance.initializationData().properties.getPropertyAsInt("Ice.Warn.Datagrams") > 0; _addr = addr; @@ -295,7 +294,6 @@ final class UdpTransceiver implements Transceiver _traceLevels = instance.traceLevels(); _logger = instance.initializationData().logger; _stats = instance.initializationData().stats; - _incoming = true; _connect = connect; _warn = instance.initializationData().properties.getPropertyAsInt("Ice.Warn.Datagrams") > 0; @@ -315,6 +313,10 @@ final class UdpTransceiver implements Transceiver Network.setReuseAddress(_fd, true); _mcastAddr = _addr; _addr = Network.doBind(_fd, Network.getAddress("0.0.0.0", port, Network.EnableIPv4)); + if(port == 0) + { + _mcastAddr = new java.net.InetSocketAddress(_mcastAddr.getAddress(), _addr.getPort()); + } configureMulticast(_mcastAddr, mcastInterface, -1); } else @@ -431,8 +433,8 @@ final class UdpTransceiver implements Transceiver { try { - java.lang.reflect.Constructor c = - Class.forName("java.net.PlainDatagramSocketImpl").getDeclaredConstructor((Class[])null); + java.lang.reflect.Constructor<?> c = + Class.forName("java.net.PlainDatagramSocketImpl").getDeclaredConstructor((Class<?>[])null); c.setAccessible(true); java.net.DatagramSocketImpl socketImpl = (java.net.DatagramSocketImpl)c.newInstance((Object[])null); @@ -441,7 +443,7 @@ final class UdpTransceiver implements Transceiver // that this hack works properly when IPv6 is enabled on Windows. // java.lang.reflect.Method m = - Class.forName("java.net.PlainDatagramSocketImpl").getDeclaredMethod("create", (Class[])null); + Class.forName("java.net.PlainDatagramSocketImpl").getDeclaredMethod("create", (Class<?>[])null); m.setAccessible(true); m.invoke(socketImpl); @@ -468,7 +470,7 @@ final class UdpTransceiver implements Transceiver if(group != null) { - Class[] types = new Class[]{ java.net.SocketAddress.class, java.net.NetworkInterface.class }; + Class<?>[] types = new Class<?>[]{ java.net.SocketAddress.class, java.net.NetworkInterface.class }; m = socketImpl.getClass().getDeclaredMethod("joinGroup", types); m.setAccessible(true); Object[] args = new Object[]{ group, intf }; @@ -476,7 +478,7 @@ final class UdpTransceiver implements Transceiver } else if(intf != null) { - Class[] types = new Class[]{ Integer.TYPE, Object.class }; + Class<?>[] types = new Class<?>[]{ Integer.TYPE, Object.class }; m = socketImpl.getClass().getDeclaredMethod("setOption", types); m.setAccessible(true); Object[] args = new Object[]{ new Integer(java.net.SocketOptions.IP_MULTICAST_IF2), intf }; @@ -485,7 +487,7 @@ final class UdpTransceiver implements Transceiver if(ttl != -1) { - Class[] types = new Class[]{ Integer.TYPE }; + Class<?>[] types = new Class<?>[]{ Integer.TYPE }; m = java.net.DatagramSocketImpl.class.getDeclaredMethod("setTimeToLive", types); m.setAccessible(true); Object[] args = new Object[]{ new Integer(ttl) }; @@ -505,11 +507,6 @@ final class UdpTransceiver implements Transceiver } } - private void - closeSocket() - { - } - protected synchronized void finalize() throws Throwable @@ -522,7 +519,6 @@ final class UdpTransceiver implements Transceiver private TraceLevels _traceLevels; private Ice.Logger _logger; private Ice.Stats _stats; - private boolean _incoming; private boolean _connect; private final boolean _warn; private int _rcvSize; |