diff -r b92aac38b046 -r 258033faefc9 src/jdk.dns.client/share/classes/jdk/dns/client/internal/HostsFileResolver.java --- a/src/jdk.dns.client/share/classes/jdk/dns/client/internal/HostsFileResolver.java Thu Nov 14 23:13:47 2019 +0000 +++ b/src/jdk.dns.client/share/classes/jdk/dns/client/internal/HostsFileResolver.java Thu Nov 14 23:16:40 2019 +0000 @@ -26,6 +26,7 @@ package jdk.dns.client.internal; import jdk.dns.client.internal.util.ReloadTracker; +import jdk.dns.conf.DnsResolverConfiguration; import sun.net.util.IPAddressUtil; import java.net.InetAddress; @@ -53,12 +54,13 @@ public class HostsFileResolver { private static final String HOSTS_FILE_LOCATION_PROPERTY_VALUE = AccessController.doPrivileged((PrivilegedAction) - () -> System.getProperty("jdk.net.hosts.file", "/etc/hosts") + () -> System.getProperty("jdk.dns.client.hosts.file", + DnsResolverConfiguration.getDefaultHostsFileLocation()) ); private static final ReadWriteLock LOCK = new ReentrantReadWriteLock(); // 300 seconds, similar to DnsResolverConfiguration in millis since Epoch - private static final long REFRESH_TIMEOUT_MILLIS = 300_000; + private static final long REFRESH_TIMEOUT_NANOS = 300_000_000_000L; private static final ReloadTracker HOSTS_FILE_TRACKER; private static volatile Map HOST_ADDRESSES = Collections.emptyMap(); @@ -262,7 +264,7 @@ // TODO: Revisit try { var pea = (PrivilegedExceptionAction) () -> - ReloadTracker.newInstance(Paths.get(HOSTS_FILE_LOCATION_PROPERTY_VALUE), REFRESH_TIMEOUT_MILLIS); + ReloadTracker.newInstance(Paths.get(HOSTS_FILE_LOCATION_PROPERTY_VALUE), REFRESH_TIMEOUT_NANOS); HOSTS_FILE_TRACKER = System.getSecurityManager() == null ? pea.run() : AccessController.doPrivileged(pea); } catch (PrivilegedActionException pae) {