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

27ef0eb2 · Neil Fuller · Gerrit Code Review · 7feb222f · 94279b64 · 27ef0eb2
Commit 27ef0eb2 authored 10 years ago by Neil Fuller Committed by Gerrit Code Review 10 years ago
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

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

No files found.
--- 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 @@ public class MulticastSocketTest extends junit.framework.TestCase {
        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 =