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

HADOOP-6490. Use StringUtils over String#replace in Path#normalizePath. Contributed by Uma Maheswara Rao G. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1182189 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Harsh J 2011-10-12 03:19:01 +00:00
parent 3f998db918
commit eba49b8b11
2 changed files with 10 additions and 5 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

@ -59,6 +59,9 @@ Trunk (unreleased changes)
HADOOP-7721. Add log before login in KerberosAuthenticationHandler. (jitendra) HADOOP-7721. Add log before login in KerberosAuthenticationHandler. (jitendra)
HADOOP-6490. Use StringUtils over String#replace in Path#normalizePath.
(Uma Maheswara Rao G via harsh)
Release 0.23.0 - Unreleased Release 0.23.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

12
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/Path.java
View File

@ -18,10 +18,12 @@
package org.apache.hadoop.fs; package org.apache.hadoop.fs;
import java.net.*; import java.io.IOException;
import java.io.*; import java.net.URI;
import org.apache.avro.reflect.Stringable; import java.net.URISyntaxException;
import org.apache.avro.reflect.Stringable;
import org.apache.commons.lang.StringUtils;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
@ -157,8 +159,8 @@ private void initialize(String scheme, String authority, String path,
private String normalizePath(String path) { private String normalizePath(String path) {
// remove double slashes & backslashes // remove double slashes & backslashes
path = path.replace("//", "/"); path = StringUtils.replace(path, "//", "/");
path = path.replace("\\", "/"); path = StringUtils.replace(path, "\\", "/");
// trim trailing slash from non-root path (ignoring windows drive) // trim trailing slash from non-root path (ignoring windows drive)
int minLength = hasWindowsDrive(path, true) ? 4 : 1; int minLength = hasWindowsDrive(path, true) ? 4 : 1;