--- a/test/jdk/java/net/httpclient/websocket/security/WSURLPermissionTest.java Tue Apr 17 15:39:20 2018 +0200
+++ b/test/jdk/java/net/httpclient/websocket/security/WSURLPermissionTest.java Tue Apr 17 08:54:17 2018 -0700
@@ -29,6 +29,7 @@
*/
import java.io.IOException;
+import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Proxy;
import java.net.ProxySelector;
@@ -44,8 +45,8 @@
import java.security.ProtectionDomain;
import java.util.List;
import java.util.concurrent.ExecutionException;
-import jdk.incubator.http.HttpClient;
-import jdk.incubator.http.WebSocket;
+import java.net.http.HttpClient;
+import java.net.http.WebSocket;
import org.testng.annotations.AfterTest;
import org.testng.annotations.BeforeTest;
import org.testng.annotations.DataProvider;
@@ -74,7 +75,8 @@
@BeforeTest
public void setup() throws Exception {
ProxyServer proxyServer = new ProxyServer(0, true);
- proxyAddress = new InetSocketAddress("127.0.0.1", proxyServer.getPort());
+ proxyAddress = new InetSocketAddress(InetAddress.getLoopbackAddress(),
+ proxyServer.getPort());
webSocketServer = new DummyWebSocketServer();
webSocketServer.open();
wsURI = webSocketServer.getURI();