--- a/test/jdk/sun/security/ssl/X509TrustManagerImpl/CheckNullEntity.java	Fri Mar 01 08:14:29 2019 -0500
+++ b/test/jdk/sun/security/ssl/X509TrustManagerImpl/CheckNullEntity.java	Fri Mar 01 08:35:14 2019 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2005, 2007, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
  * @summary unspecified exceptions in X509TrustManager.checkClient[Server]Truste
 d
  * @author Xuelei Fan
- * @modules java.base/com.sun.net.ssl.internal.ssl
  */
 
 import java.io.*;
@@ -37,8 +36,6 @@
 import java.security.*;
 import java.util.Enumeration;
 
-import com.sun.net.ssl.internal.ssl.X509ExtendedTrustManager;
-
 public class CheckNullEntity {
 
     /*
@@ -157,7 +154,7 @@
             if (trustManager instanceof X509ExtendedTrustManager) {
                 try {
                     ((X509ExtendedTrustManager)trustManager).checkClientTrusted(
-                        certChain, (String)null, "localhost", null);
+                        certChain, (String)null, (Socket)null);
                 } catch (IllegalArgumentException iae) {
                     // get the right exception
                     extFailed >>= 1;
@@ -165,7 +162,7 @@
 
                 try {
                     ((X509ExtendedTrustManager)trustManager).checkServerTrusted(
-                        certChain, (String)null, "localhost", null);
+                        certChain, (String)null, (Socket)null);
                 } catch (IllegalArgumentException iae) {
                     // get the right exception
                     extFailed >>= 1;
@@ -173,7 +170,7 @@
 
                 try {
                     ((X509ExtendedTrustManager)trustManager).checkClientTrusted(
-                        certChain, "", "localhost", null);
+                        certChain, "", (Socket)null);
                 } catch (IllegalArgumentException iae) {
                     // get the right exception
                     extFailed >>= 1;
@@ -181,7 +178,7 @@
 
                 try {
                     ((X509ExtendedTrustManager)trustManager).checkServerTrusted(
-                        certChain, "", "localhost", null);
+                        certChain, "", (Socket)null);
                 } catch (IllegalArgumentException iae) {
                     // get the right exception
                     extFailed >>= 1;
@@ -189,7 +186,7 @@
 
                 try {
                     ((X509ExtendedTrustManager)trustManager).checkClientTrusted(
-                        null, authType, "localhost", null);
+                        null, authType, (Socket)null);
                 } catch (IllegalArgumentException iae) {
                     // get the right exception
                     extFailed >>= 1;
@@ -197,7 +194,7 @@
 
                 try {
                     ((X509ExtendedTrustManager)trustManager).checkServerTrusted(
-                        null, authType, "localhost", null);
+                        null, authType, (Socket)null);
                 } catch (IllegalArgumentException iae) {
                     // get the right exception
                     extFailed >>= 1;