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

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

svn merge --ignore-ancestry -c 1229379 ../../trunk/


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1229382 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2012-01-09 21:56:02 +00:00
parent 65e6abb477
commit 63bd96d5f9
2 changed files with 4 additions and 1 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

@ -123,6 +123,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

2
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java
View File

@ -514,7 +514,7 @@ public class ViewFileSystem extends FileSystem {
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);