6898234: (dc) Multicast tests fail on OpenSolaris with vboxnet0 adapter

Reviewed-by: chegar

test/ProblemList.txt

@@ -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
 

test/java/nio/channels/DatagramChannel/NetworkConfiguration.java

@@ -73,6 +73,7 @@ class NetworkConfiguration {
 
             List<InetAddress> addrs = Collections.list(nif.getInetAddresses());
             for (InetAddress addr: addrs) {
+                if (!addr.isAnyLocalAddress()) {
                     if (addr instanceof Inet4Address) {
                         List<InetAddress> list = ip4Interfaces.get(nif);
                         if (list == null) {
@@ -80,15 +81,14 @@ class NetworkConfiguration {
                         }
                         list.add(addr);
                         ip4Interfaces.put(nif, list);
-                }
-                if (addr instanceof Inet6Address) {
+                    } 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);
-
+                    }
                 }
             }
         }