HADOOP-7859. TestViewFsHdfs.testgetFileLinkStatus is failing an assert. Contributed by Eli Collins
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1206786 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
6558066820
commit
cb5c6c90c4
@ -136,6 +136,8 @@ Release 0.23.1 - Unreleased
|
|||||||
HADOOP-6614. RunJar should provide more diags when it can't create
|
HADOOP-6614. RunJar should provide more diags when it can't create
|
||||||
a temp file. (Jonathan Hsieh via eli)
|
a temp file. (Jonathan Hsieh via eli)
|
||||||
|
|
||||||
|
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
|
||||||
|
@ -1099,18 +1099,10 @@ public FileStatus next(final AbstractFileSystem fs, final Path p)
|
|||||||
*/
|
*/
|
||||||
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;
|
||||||
|
Loading…
Reference in New Issue
Block a user