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

HADOOP-7859. svn merge -c 1206786 from trunk 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1206790 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Eli Collins 2011-11-27 18:04:38 +00:00
parent 5f917439e5
commit d26b39fec3
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,8 @@ Release 0.23.1 - Unreleased
HADOOP-7843. compilation failing because workDir not initialized in HADOOP-7843. compilation failing because workDir not initialized in
RunJar.java (John George via mahadev) RunJar.java (John George via mahadev)
HADOOP-7859. TestViewFsHdfs.testgetFileLinkStatus is failing an assert. (eli)
Release 0.23.0 - 2011-11-01 Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

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

@ -1099,18 +1099,10 @@ public final class FileContext {
*/ */
private Path qualifySymlinkTarget(final AbstractFileSystem pathFS, private Path qualifySymlinkTarget(final AbstractFileSystem pathFS,
Path pathWithLink, Path target) { Path pathWithLink, Path target) {
/* NB: makeQualified uses the target's scheme and authority, if // NB: makeQualified uses the target's scheme and authority, if
* specified, and the scheme and authority of pathFS, if not. If // specified, and the scheme and authority of pathFS, if not.
* the path does have a scheme and authority we assert they match
* those of pathFS since resolve updates the file system of a path
* that contains links each time a link is encountered.
*/
final String scheme = target.toUri().getScheme(); final String scheme = target.toUri().getScheme();
final String auth = target.toUri().getAuthority(); final String auth = target.toUri().getAuthority();
if (scheme != null && auth != null) {
assert scheme.equals(pathFS.getUri().getScheme());
assert auth.equals(pathFS.getUri().getAuthority());
}
return (scheme == null && auth == null) return (scheme == null && auth == null)
? target.makeQualified(pathFS.getUri(), pathWithLink.getParent()) ? target.makeQualified(pathFS.getUri(), pathWithLink.getParent())
: target; : target;