archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 19:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6934923: test/java/net/ipv6tests/TcpTest.java hangs on Solaris 10

Browse source 
Reviewed-by: alanb
This commit is contained in:
Chris Hegarty 2010-03-16 10:05:51 +00:00
parent 7fbd8c28c1
commit f2034e6bba
2 changed files with 29 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
jdk/test/java/net/ipv6tests/TcpTest.java
View file

@ -47,9 +47,11 @@ public class TcpTest extends Tests {
try {
ia4any = InetAddress.getByName ("0.0.0.0");
ia6any = InetAddress.getByName ("::0");
int scope = ia6addr.getScopeId();
if (scope != 0) {
ia6bad = InetAddress.getByName ("fe80::1:2:3:4:5:6%"+scope);
if (ia6addr != null) {
int scope = ia6addr.getScopeId();
if (scope != 0) {
ia6bad = InetAddress.getByName ("fe80::1:2:3:4:5:6%"+scope);
}
} else {
ia6bad = InetAddress.getByName ("fe80::1:2:3:4:5:6");
}

33
jdk/test/java/net/ipv6tests/Tests.java
View file

@ -38,12 +38,25 @@ public class Tests {
OutputStream o1 = s1.getOutputStream();
OutputStream o2 = s2.getOutputStream();
simpleWrite (o1, 100);
simpleWrite (o2, 200);
startSimpleWriter("SimpleWriter-1", o1, 100);
startSimpleWriter("SimpleWriter-2", o2, 200);
simpleRead (i2, 100);
simpleRead (i1, 200);
}
static void startSimpleWriter(String threadName, final OutputStream os, final int start) {
(new Thread(new Runnable() {
public void run() {
try { simpleWrite(os, start); }
catch (Exception e) {unexpected(e); }
}}, threadName)).start();
}
static void unexpected(Exception e ) {
System.out.println("Unexcepted Exception: " + e);
e.printStackTrace();
}
/**
* Send a packet from s1 to s2 (ia2/s2.localPort) and check it
* Send a packet from s2 to s1 (ia1/s1.localPort) and check it
@ -247,13 +260,15 @@ public class Tests {
}
private NetworkInterface getNextIf () {
while (ifs.hasMoreElements()) {
NetworkInterface nic = (NetworkInterface)ifs.nextElement();
try {
if (nic.isUp() && !nic.isLoopback())
return nic;
} catch (SocketException e) {
// ignore
if (ifs != null) {
while (ifs.hasMoreElements()) {
NetworkInterface nic = (NetworkInterface)ifs.nextElement();
try {
if (nic.isUp() && !nic.isLoopback())
return nic;
} catch (SocketException e) {
// ignore
}
}
}