hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From oz...@apache.org
Subject [1/2] hadoop git commit: Revert "HADOOP-11589. NetUtils.createSocketAddr should trim the input URI. Contributed by Rakesh R."
Date Sat, 14 Feb 2015 15:34:49 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 e082992e2 -> b7836c18e


Revert "HADOOP-11589. NetUtils.createSocketAddr should trim the input URI. Contributed by
Rakesh R."

This reverts commit e082992e2a238543bf3caf22df133869df108409.


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/481124bd
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/481124bd
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/481124bd

Branch: refs/heads/branch-2
Commit: 481124bd613aa6a913ee6d65d64551334b8736cb
Parents: e082992
Author: Tsuyoshi Ozawa <ozawa@apache.org>
Authored: Sun Feb 15 00:31:15 2015 +0900
Committer: Tsuyoshi Ozawa <ozawa@apache.org>
Committed: Sun Feb 15 00:31:15 2015 +0900

----------------------------------------------------------------------
 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/481124bd/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 ff71162..e354682 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -197,9 +197,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/481124bd/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/481124bd/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 fa522d2..74590e9 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
@@ -1355,16 +1355,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()


Mime
View raw message