HADOOP-7963. Fix ViewFS to catch a null canonical service-name and pass tests TestViewFileSystem* (Siddharth Seth via vinodkv)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1229379 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2012-01-09 21:52:53 +00:00
parent e8645636ce
commit 8feb26f116
2 changed files with 4 additions and 1 deletions

View File

@ -263,6 +263,9 @@ Release 0.23.1 - Unreleased
HADOOP-7936. There's a Hoop README in the root dir of the tarball. (tucu) HADOOP-7936. There's a Hoop README in the root dir of the tarball. (tucu)
HADOOP-7963. Fix ViewFS to catch a null canonical service-name and pass
tests TestViewFileSystem* (Siddharth Seth via vinodkv)
Release 0.23.0 - 2011-11-01 Release 0.23.0 - 2011-11-01
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

View File

@ -514,7 +514,7 @@ public List<Token<?>> getDelegationTokens(String renewer,
for (int i = 0; i < mountPoints.size(); ++i) { for (int i = 0; i < mountPoints.size(); ++i) {
String serviceName = String serviceName =
mountPoints.get(i).target.targetFileSystem.getCanonicalServiceName(); mountPoints.get(i).target.targetFileSystem.getCanonicalServiceName();
if (seenServiceNames.contains(serviceName)) { if (serviceName == null || seenServiceNames.contains(serviceName)) {
continue; continue;
} }
seenServiceNames.add(serviceName); seenServiceNames.add(serviceName);