Author: vinodkv Date: Mon Jan 9 21:56:02 2012 New Revision: 1229382 URL: http://svn.apache.org/viewvc?rev=1229382&view=rev Log: 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/
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt?rev=1229382&r1=1229381&r2=1229382&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt Mon Jan 9 21:56:02 2012 @@ -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-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 INCOMPATIBLE CHANGES Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java?rev=1229382&r1=1229381&r2=1229382&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/viewfs/ViewFileSystem.java Mon Jan 9 21:56:02 2012 @@ -514,7 +514,7 @@ public class ViewFileSystem extends File for (int i = 0; i < mountPoints.size(); ++i) { String serviceName = mountPoints.get(i).target.targetFileSystem.getCanonicalServiceName(); - if (seenServiceNames.contains(serviceName)) { + if (serviceName == null || seenServiceNames.contains(serviceName)) { continue; } seenServiceNames.add(serviceName);