Rvert "HADOOP-11589. NetUtils.createSocketAddr should trim the input URI. Contributed by Rakesh R."
This reverts commit 965ce9e24ed051c6705defc0f85dcfaa4fc9a3ef. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/86a63b45 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/86a63b45 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/86a63b45 Branch: refs/heads/HDFS-7285 Commit: 86a63b45d759e38a5ba979ca8ed801acb2bcfa7c Parents: 00cfb25 Author: Tsuyoshi Ozawa <oz...@apache.org> Authored: Sun Feb 15 00:28:59 2015 +0900 Committer: Zhe Zhang <z...@apache.org> Committed: Mon Feb 16 10:29:50 2015 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 --- .../src/main/java/org/apache/hadoop/net/NetUtils.java | 1 - .../java/org/apache/hadoop/conf/TestConfiguration.java | 10 ---------- 3 files changed, 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/86a63b45/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 522ec47..99320cb 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -602,9 +602,6 @@ Release 2.7.0 - UNRELEASED HADOOP-9869. Configuration.getSocketAddr()/getEnum() should use getTrimmed(). (Tsuyoshi Ozawa via aajisaka) - HADOOP-11589. NetUtils.createSocketAddr should trim the input URI. - (Rakesh R via ozawa) - OPTIMIZATIONS HADOOP-11323. WritableComparator#compare keeps reference to byte array. http://git-wip-us.apache.org/repos/asf/hadoop/blob/86a63b45/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java index e475149..ef1092b 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java @@ -189,7 +189,6 @@ public class NetUtils { throw new IllegalArgumentException("Target address cannot be null." + helpText); } - target = target.trim(); boolean hasScheme = target.contains("://"); URI uri = null; try { http://git-wip-us.apache.org/repos/asf/hadoop/blob/86a63b45/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java index b7c76eb..a367553 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java @@ -1480,16 +1480,6 @@ public class TestConfiguration extends TestCase { // it's expected behaviour. } - public void testTrimCreateSocketAddress() { - Configuration conf = new Configuration(); - NetUtils.addStaticResolution("host", "127.0.0.1"); - final String defaultAddr = "host:1 "; - - InetSocketAddress addr = NetUtils.createSocketAddr(defaultAddr); - conf.setSocketAddr("myAddress", addr); - assertEquals(defaultAddr.trim(), NetUtils.getHostPortString(addr)); - } - public static void main(String[] argv) throws Exception { junit.textui.TestRunner.main(new String[]{ TestConfiguration.class.getName()