Explorar o código

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

This reverts commit 965ce9e24ed051c6705defc0f85dcfaa4fc9a3ef.
Tsuyoshi Ozawa %!s(int64=10) %!d(string=hai) anos
pai
achega
86a63b45d7

+ 0 - 3
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.

+ 0 - 1
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 {

+ 0 - 10
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()