HADOOP-3107. Fix NPE when fsck invokes getListings. (dhruba)

svn merge -c 642035



git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.16@642036 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -49,6 +49,8 @@ Release 0.16.2 - Unreleased
     HADOOP-3084. Fix HftpFileSystem to work for zero-lenghth files.
     (cdouglas)
 
+    HADOOP-3107. Fix NPE when fsck invokes getListings. (dhruba)
+
 Release 0.16.1 - 2008-03-13
 
   INCOMPATIBLE CHANGES

src/java/org/apache/hadoop/dfs/NamenodeFsck.java

@@ -144,11 +144,14 @@ public class NamenodeFsck {
     String path = file.getPath().toString();
 
     if (file.isDir()) {
+      DFSFileInfo[] files = nn.namesystem.dir.getListing(path);
+      if (files == null) {
+        return;
+      }
       if (showFiles) {
         out.println(path + " <dir>");
       }
       res.totalDirs++;
-      DFSFileInfo[] files = nn.namesystem.dir.getListing(path);
       for (int i = 0; i < files.length; i++) {
         check(files[i], res);
       }