6898234: (dc) Multicast tests fail on OpenSolaris with vboxnet0 adapter
Reviewed-by: chegar
This commit is contained in:
parent
a7ec8a6b09
commit
aac491b420
@ -719,12 +719,6 @@ com/sun/nio/sctp/SctpChannel/Receive.java generic-all
|
||||
# Triggers a hotspot crash on Fedora 9 32bit -server and Windows X64 samevm
|
||||
sun/nio/cs/TestUTF8.java generic-all
|
||||
|
||||
# Fails on OpenSolaris, IllegalArgumentException: Source address is a wildcard
|
||||
java/nio/channels/DatagramChannel/BasicMulticastTests.java generic-all
|
||||
|
||||
# Fails on OpenSolaris, RuntimeException: Expected message not recieved
|
||||
java/nio/channels/DatagramChannel/MulticastSendReceiveTests.java generic-all
|
||||
|
||||
# Solaris sparc, socket timeout
|
||||
java/nio/channels/spi/SelectorProvider/inheritedChannel/run_tests.sh generic-all
|
||||
|
||||
|
@ -73,22 +73,22 @@ class NetworkConfiguration {
|
||||
|
||||
List<InetAddress> addrs = Collections.list(nif.getInetAddresses());
|
||||
for (InetAddress addr: addrs) {
|
||||
if (addr instanceof Inet4Address) {
|
||||
List<InetAddress> list = ip4Interfaces.get(nif);
|
||||
if (list == null) {
|
||||
list = new LinkedList<InetAddress>();
|
||||
if (!addr.isAnyLocalAddress()) {
|
||||
if (addr instanceof Inet4Address) {
|
||||
List<InetAddress> list = ip4Interfaces.get(nif);
|
||||
if (list == null) {
|
||||
list = new LinkedList<InetAddress>();
|
||||
}
|
||||
list.add(addr);
|
||||
ip4Interfaces.put(nif, list);
|
||||
} else if (addr instanceof Inet6Address) {
|
||||
List<InetAddress> list = ip6Interfaces.get(nif);
|
||||
if (list == null) {
|
||||
list = new LinkedList<InetAddress>();
|
||||
}
|
||||
list.add(addr);
|
||||
ip6Interfaces.put(nif, list);
|
||||
}
|
||||
list.add(addr);
|
||||
ip4Interfaces.put(nif, list);
|
||||
}
|
||||
if (addr instanceof Inet6Address) {
|
||||
List<InetAddress> list = ip6Interfaces.get(nif);
|
||||
if (list == null) {
|
||||
list = new LinkedList<InetAddress>();
|
||||
}
|
||||
list.add(addr);
|
||||
ip6Interfaces.put(nif, list);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user