1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Alejandro Murillo 2015-06-23 14:20:59 -07:00
commit ebcc321eeb
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
jdk/test/java/net/Inet6Address/serialize/Inet6AddressSerializationTest.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -49,6 +49,8 @@ public class Inet6AddressSerializationTest {
static boolean failed; static boolean failed;
static boolean isWindows = System.getProperty("os.name").startsWith("Windows");
public static final int LOOPBACK_SCOPE_ID = 0; public static final int LOOPBACK_SCOPE_ID = 0;
public static final byte[] IN6ADDR_ANY_INIT = { (byte) 0x00, (byte) 0x00, public static final byte[] IN6ADDR_ANY_INIT = { (byte) 0x00, (byte) 0x00,
@ -175,6 +177,13 @@ public class Inet6AddressSerializationTest {
for (Enumeration<NetworkInterface> e = NetworkInterface for (Enumeration<NetworkInterface> e = NetworkInterface
.getNetworkInterfaces(); e.hasMoreElements();) { .getNetworkInterfaces(); e.hasMoreElements();) {
NetworkInterface netIF = e.nextElement(); NetworkInterface netIF = e.nextElement();
// Skip (Windows)Teredo Tunneling Pseudo-Interface
if (isWindows) {
String dName = netIF.getDisplayName();
if (dName != null && dName.contains("Teredo")) {
continue;
}
}
for (Enumeration<InetAddress> iadrs = netIF.getInetAddresses(); iadrs for (Enumeration<InetAddress> iadrs = netIF.getInetAddresses(); iadrs
.hasMoreElements();) { .hasMoreElements();) {
InetAddress iadr = iadrs.nextElement(); InetAddress iadr = iadrs.nextElement();