diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-08-13 12:21:29 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-08-13 12:21:29 -0230 |
| commit | d71e80da796071b18ee77c848e90febdc2e59250 (patch) | |
| tree | 97d4225e3a24e2a37574a24c025d20b4fa54beb4 | |
| parent | Minor fix to Expect script (diff) | |
| download | ice-d71e80da796071b18ee77c848e90febdc2e59250.tar.bz2 ice-d71e80da796071b18ee77c848e90febdc2e59250.tar.xz ice-d71e80da796071b18ee77c848e90febdc2e59250.zip | |
ICE-6407 java udp test failure
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java | 11 |
2 files changed, 3 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index 8af6993637d..12871c663b9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ install: before_script: - make -j3 script: -- python allTests.py --debug --env --protocol=ssl --rfilter='java/test/Ice/udp' +- python allTests.py --debug --env --protocol=ssl notifications: email: travis-ci@zeroc.com slack: diff --git a/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java b/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java index 5a3083af9e5..5ecac1b716a 100644 --- a/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java +++ b/java/src/Ice/src/main/java/IceInternal/UdpTransceiver.java @@ -555,11 +555,6 @@ final class UdpTransceiver implements Transceiver java.util.Collections.list(java.net.NetworkInterface.getNetworkInterfaces()); for(java.net.NetworkInterface iface : interfaces) { - if(!iface.supportsMulticast()) - { - continue; - } - boolean hasProtocolAddress = false; java.util.List<java.net.InetAddress> addresses = java.util.Collections.list(iface.getInetAddresses()); @@ -583,10 +578,8 @@ final class UdpTransceiver implements Transceiver if(!join) { throw new Ice.SocketException(new IllegalArgumentException( - "There aren't any interfaces that support multicast, " + - "or the interfaces that support it\n" + - "are not configured for the group protocol. " + - "Cannot join the mulitcast group.")); + "There are no interfaces that are configured for the group protocol.\n" + + "Cannot join the multicast group.")); } } } |