You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by oz...@apache.org on 2015/02/14 16:34:42 UTC
[2/2] hadoop git commit: HADOOP-11589. NetUtils.createSocketAddr
should trim the input URI. Contributed by Rakesh R.
HADOOP-11589. NetUtils.createSocketAddr should trim the input URI. Contributed by Rakesh R.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ef950ea1
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ef950ea1
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ef950ea1
Branch: refs/heads/trunk
Commit: ef950ea1c08f5a95137a95df6d4c90241a25b70e
Parents: b7d4828
Author: Tsuyoshi Ozawa <oz...@apache.org>
Authored: Sun Feb 15 00:30:46 2015 +0900
Committer: Tsuyoshi Ozawa <oz...@apache.org>
Committed: Sun Feb 15 00:30:46 2015 +0900
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../src/main/java/org/apache/hadoop/net/NetUtils.java | 1 +
.../test/java/org/apache/hadoop/net/TestNetUtils.java | 11 +++++++++++
3 files changed, 15 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/ef950ea1/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 99320cb..522ec47 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -602,6 +602,9 @@ 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/ef950ea1/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 ef1092b..e475149 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,6 +189,7 @@ 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/ef950ea1/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java
index 319e8a9..a12054b 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/net/TestNetUtils.java
@@ -643,6 +643,17 @@ public class TestNetUtils {
assertNotNull(NetUtils.getHostNameOfIP("127.0.0.1:1"));
}
+ @Test
+ 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));
+ }
+
private <T> void assertBetterArrayEquals(T[] expect, T[]got) {
String expectStr = StringUtils.join(expect, ", ");
String gotStr = StringUtils.join(got, ", ");