Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Tsuyoshi Ozawa 2015-02-15 00:13:10 +09:00
parent 6804d68901
commit 965ce9e24e
3 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -602,6 +602,9 @@ Release 2.7.0 - UNRELEASED
HADOOP-9869. Configuration.getSocketAddr()/getEnum() should use HADOOP-9869. Configuration.getSocketAddr()/getEnum() should use
getTrimmed(). (Tsuyoshi Ozawa via aajisaka) getTrimmed(). (Tsuyoshi Ozawa via aajisaka)
HADOOP-11589. NetUtils.createSocketAddr should trim the input URI.
(Rakesh R via ozawa)
OPTIMIZATIONS OPTIMIZATIONS
HADOOP-11323. WritableComparator#compare keeps reference to byte array. HADOOP-11323. WritableComparator#compare keeps reference to byte array.

1
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/net/NetUtils.java
View File

@ -189,6 +189,7 @@ public class NetUtils {
throw new IllegalArgumentException("Target address cannot be null." + throw new IllegalArgumentException("Target address cannot be null." +
helpText); helpText);
} }
target = target.trim();
boolean hasScheme = target.contains("://"); boolean hasScheme = target.contains("://");
URI uri = null; URI uri = null;
try { try {

10
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/conf/TestConfiguration.java
View File

@ -1480,6 +1480,16 @@ public class TestConfiguration extends TestCase {
// it's expected behaviour. // 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 { public static void main(String[] argv) throws Exception {
junit.textui.TestRunner.main(new String[]{ junit.textui.TestRunner.main(new String[]{
TestConfiguration.class.getName() TestConfiguration.class.getName()