From e16d4a45b062d2ed69411ec5009eec6d3c03bb5e Mon Sep 17 00:00:00 2001 From: Daniel Fuchs Date: Tue, 17 Dec 2019 16:11:16 +0100 Subject: [PATCH] 8235925: java/net/Socket/HttpProxy.java fails on IPv4 only hosts and other small cleanups HttpProxy test is fixed to take into account the possibility that the host may be configured with IPv4 only Reviewed-by: chegar --- .../NoSetNetworkInterface.java | 0 test/jdk/java/net/Socket/HttpProxy.java | 6 +++++- test/jdk/java/net/SocketOption/OptionsTest.java | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) rename test/jdk/java/net/{NetworkInterface => MulticastSocket}/NoSetNetworkInterface.java (100%) diff --git a/test/jdk/java/net/NetworkInterface/NoSetNetworkInterface.java b/test/jdk/java/net/MulticastSocket/NoSetNetworkInterface.java similarity index 100% rename from test/jdk/java/net/NetworkInterface/NoSetNetworkInterface.java rename to test/jdk/java/net/MulticastSocket/NoSetNetworkInterface.java diff --git a/test/jdk/java/net/Socket/HttpProxy.java b/test/jdk/java/net/Socket/HttpProxy.java index 01727636836..e87ab4e5cc8 100644 --- a/test/jdk/java/net/Socket/HttpProxy.java +++ b/test/jdk/java/net/Socket/HttpProxy.java @@ -91,6 +91,10 @@ public class HttpProxy { this.proxyPort = proxyPort; } + static boolean canUseIPv6() { + return IPSupport.hasIPv6() && !IPSupport.preferIPv4Stack(); + } + void test() throws Exception { InetSocketAddress proxyAddress = new InetSocketAddress(proxyHost, proxyPort); Proxy httpProxy = new Proxy(Proxy.Type.HTTP, proxyAddress); @@ -101,7 +105,7 @@ public class HttpProxy { externalAddresses.add( new InetSocketAddress(InetAddress.getLocalHost(), ss.getLocalPort())); - if (!"true".equals(System.getProperty("java.net.preferIPv4Stack"))) { + if (canUseIPv6()) { byte[] bytes = new byte[] {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1}; var address = InetAddress.getByAddress(bytes); externalAddresses.add( diff --git a/test/jdk/java/net/SocketOption/OptionsTest.java b/test/jdk/java/net/SocketOption/OptionsTest.java index 556ecad7aea..ce4fc18b355 100644 --- a/test/jdk/java/net/SocketOption/OptionsTest.java +++ b/test/jdk/java/net/SocketOption/OptionsTest.java @@ -23,7 +23,7 @@ /* * @test - * @bug 8036979 8072384 8044773 8225214 8233296 + * @bug 8036979 8072384 8044773 8225214 8233296 8234083 * @library /test/lib * @requires !vm.graal.enabled * @run main/othervm -Xcheck:jni OptionsTest