# HG changeset patch
# User chegar
# Date 1277754757 -3600
# Node ID 2d5303114f44afb69275049bc2c5d24ec1b06c4d
# Parent  38a40caa84fceb03a41ec83a12e8b88eaa35fcd8
6961029: java/net/BindException/Test.java should not use wildcard address
Reviewed-by: michaelm, alanb

diff -r 38a40caa84fc -r 2d5303114f44 jdk/test/ProblemList.txt
--- a/jdk/test/ProblemList.txt	Mon Jun 28 15:06:24 2010 +0100
+++ b/jdk/test/ProblemList.txt	Mon Jun 28 20:52:37 2010 +0100
@@ -379,9 +379,6 @@
 #   Interrupted or IO exception, maybe writing to non-unique named file?
 com/sun/net/httpserver/bugs/B6373555.java			generic-all
 
-# Fails on OpenSolaris, BindException unexpected 
-java/net/BindException/Test.java				generic-all
-
 # Fails on OpenSolaris, times out
 java/net/MulticastSocket/SetOutgoingIf.java			generic-all
 
diff -r 38a40caa84fc -r 2d5303114f44 jdk/test/java/net/BindException/Test.java
--- a/jdk/test/java/net/BindException/Test.java	Mon Jun 28 15:06:24 2010 +0100
+++ b/jdk/test/java/net/BindException/Test.java	Mon Jun 28 20:52:37 2010 +0100
@@ -180,7 +180,7 @@
             while (addrs.hasMoreElements()) {
                 InetAddress ia = (InetAddress)addrs.nextElement();
 
-                if (ia.isLoopbackAddress()) {
+                if (ia.isLoopbackAddress() || ia.isAnyLocalAddress()) {
                     continue;
                 }
 
diff -r 38a40caa84fc -r 2d5303114f44 jdk/test/java/net/ipv6tests/Tests.java
--- a/jdk/test/java/net/ipv6tests/Tests.java	Mon Jun 28 15:06:24 2010 +0100
+++ b/jdk/test/java/net/ipv6tests/Tests.java	Mon Jun 28 20:52:37 2010 +0100
@@ -248,7 +248,8 @@
                 }
                 while (addrs.hasMoreElements()) {
                     InetAddress addr = (InetAddress) addrs.nextElement();
-                    if (filter.isInstance (addr) && !addr.isLoopbackAddress()) {
+                    if (filter.isInstance (addr) && !addr.isLoopbackAddress()
+                            && !addr.isAnyLocalAddress()) {
                         if (Arrays.equals (addr.getAddress(), fe80_loopback)) {
                             continue;
                         }