Repository: hadoop Updated Branches: refs/heads/trunk 646874c32 -> 3da94a36e
HADOOP-15756. [JDK10] Migrate from sun.net.util.IPAddressUtil to the replacement. Contributed by Akira Ajisaka. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3da94a36 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3da94a36 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3da94a36 Branch: refs/heads/trunk Commit: 3da94a36e21a315c09ec7edb7702820fe2b524f9 Parents: 646874c Author: Ewan Higgs <ewan.hi...@wdc.com> Authored: Thu Sep 20 14:53:21 2018 +0200 Committer: Ewan Higgs <ewan.hi...@wdc.com> Committed: Thu Sep 20 14:53:21 2018 +0200 ---------------------------------------------------------------------- .../org/apache/hadoop/security/SecurityUtil.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3da94a36/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java index 5f8cb29..0de334a 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/security/SecurityUtil.java @@ -54,9 +54,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; //this will need to be replaced someday when there is a suitable replacement import sun.net.dns.ResolverConfiguration; -import sun.net.util.IPAddressUtil; import com.google.common.annotations.VisibleForTesting; +import com.google.common.net.InetAddresses; /** * Security Utils. @@ -604,14 +604,11 @@ public final class SecurityUtil { public InetAddress getByName(String host) throws UnknownHostException { InetAddress addr = null; - if (IPAddressUtil.isIPv4LiteralAddress(host)) { - // use ipv4 address as-is - byte[] ip = IPAddressUtil.textToNumericFormatV4(host); - addr = InetAddress.getByAddress(host, ip); - } else if (IPAddressUtil.isIPv6LiteralAddress(host)) { - // use ipv6 address as-is - byte[] ip = IPAddressUtil.textToNumericFormatV6(host); - addr = InetAddress.getByAddress(host, ip); + if (InetAddresses.isInetAddress(host)) { + // valid ip address. use it as-is + addr = InetAddresses.forString(host); + // set hostname + addr = InetAddress.getByAddress(host, addr.getAddress()); } else if (host.endsWith(".")) { // a rooted host ends with a dot, ex. "host." // rooted hosts never use the search path, so only try an exact lookup --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
