You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by lo...@apache.org on 2009/02/23 06:33:12 UTC

svn commit: r746889 - in /hadoop/core/branches/branch-0.20: CHANGES.txt src/core/org/apache/hadoop/fs/kfs/KosmosFileSystem.java

Author: lohit
Date: Mon Feb 23 05:33:12 2009
New Revision: 746889

URL: http://svn.apache.org/viewvc?rev=746889&view=rev
Log:
HADOOP-5292. Fix NPE in KFS::getBlockLocations. (Sriram Rao via lohit)


Modified:
    hadoop/core/branches/branch-0.20/CHANGES.txt
    hadoop/core/branches/branch-0.20/src/core/org/apache/hadoop/fs/kfs/KosmosFileSystem.java

Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=746889&r1=746888&r2=746889&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Mon Feb 23 05:33:12 2009
@@ -635,6 +635,8 @@
 
     HADOOP-4963. Fixes a logging to do with getting the location of
     map output file. (Amareshwari Sriramadasu via ddas)
+    
+    HADOOP-5292. Fix NPE in KFS::getBlockLocations. (Sriram Rao via lohit)    
 
 Release 0.19.1 - Unreleased
 

Modified: hadoop/core/branches/branch-0.20/src/core/org/apache/hadoop/fs/kfs/KosmosFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/core/org/apache/hadoop/fs/kfs/KosmosFileSystem.java?rev=746889&r1=746888&r2=746889&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/core/org/apache/hadoop/fs/kfs/KosmosFileSystem.java (original)
+++ hadoop/core/branches/branch-0.20/src/core/org/apache/hadoop/fs/kfs/KosmosFileSystem.java Mon Feb 23 05:33:12 2009
@@ -297,6 +297,9 @@
       }
       String srep = makeAbsolute(file.getPath()).toUri().getPath();
       String[][] hints = kfsImpl.getDataLocation(srep, start, len);
+      if (hints == null) {
+        return null;
+      }
       BlockLocation[] result = new BlockLocation[hints.length];
       long blockSize = getDefaultBlockSize();
       long length = len;