--- a/src/java.base/share/classes/java/net/InetAddress.java Thu Nov 14 13:50:03 2019 +0000
+++ b/src/java.base/share/classes/java/net/InetAddress.java Thu Nov 14 23:13:47 2019 +0000
@@ -29,7 +29,6 @@
import java.util.ArrayList;
import java.util.Objects;
import java.util.Scanner;
-import java.security.AccessController;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.ObjectStreamException;
@@ -349,10 +348,11 @@
if (nameService != null) {
return nameService;
}
- var nameService = ServiceLoader.load(NameService.class)
- .findFirst()
- .orElse(defaultNameService);
- InetAddress.nameService = nameService;
+ String hostsFileProperty = GetPropertyAction.privilegedGetProperty("jdk.net.hosts.file");
+ var cns = hostsFileProperty == null ?
+ ServiceLoader.load(NameService.class).findFirst().orElse(defaultNameService)
+ : defaultNameService;
+ InetAddress.nameService = cns;
return nameService;
}
} else {