commit 27ef0eb26e179b7750b9cb72018da9fab3a0bbb0
author Neil Fuller <nfuller@google.com> Tue Jun 02 16:14:35 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 02 16:14:35 2015 +0000
tree dca7303d54b9b04d92219fb3012f0399953456c8
parent 7feb222f57a3f9ce9d03cb574486e05533f8ef9f
parent 94279b64bcc98d8e28170204cf4aef0d803c7705

Merge "Fix for MulticastSocketTest for non-multicast interfaces" into lollipop-cts-dev

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java

diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java
index d531301..828dc99 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java
@@ -706,7 +706,7 @@
         Enumeration theInterfaces = NetworkInterface.getNetworkInterfaces();
         while (theInterfaces.hasMoreElements()) {
             NetworkInterface thisInterface = (NetworkInterface) theInterfaces.nextElement();
-            if (thisInterface.getInetAddresses().hasMoreElements() && thisInterface.isUp()) {
+            if (willWorkForMulticast(thisInterface)) {
                 if ((!(thisInterface.getInetAddresses().nextElement()).isLoopbackAddress())) {
                     MulticastSocket receivingSocket = createReceivingSocket(0);
                     InetSocketAddress groupAddress =