diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 277da1d0dad..edadabf3362 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -31,6 +31,8 @@ Release 0.23.1 - Unreleased HADOOP-7843. compilation failing because workDir not initialized in RunJar.java (John George via mahadev) + HADOOP-7859. TestViewFsHdfs.testgetFileLinkStatus is failing an assert. (eli) + Release 0.23.0 - 2011-11-01 INCOMPATIBLE CHANGES diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java index 5a14f82a675..21c9da1248a 100644 --- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java +++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileContext.java @@ -1099,18 +1099,10 @@ public FileStatus next(final AbstractFileSystem fs, final Path p) */ private Path qualifySymlinkTarget(final AbstractFileSystem pathFS, Path pathWithLink, Path target) { - /* NB: makeQualified uses the target's scheme and authority, if - * specified, and the scheme and authority of pathFS, if not. If - * 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. - */ + // NB: makeQualified uses the target's scheme and authority, if + // specified, and the scheme and authority of pathFS, if not. final String scheme = target.toUri().getScheme(); 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) ? target.makeQualified(pathFS.getUri(), pathWithLink.getParent()) : target;