commit 11131d72040c250f897a8d1c130b83ce1b065050
author Tsz-wo Sze <szetszwo@apache.org> Fri Apr 22 20:29:29 2011 +0000
committer Tsz-wo Sze <szetszwo@apache.org> Fri Apr 22 20:29:29 2011 +0000
tree ec38c19c1df65485ded3938fba4a04ac182c332d
parent ac3445f84c3699f5032374587c3c80087b598e0f

MAPREDUCE-2317. Fix a NPE in HadoopArchives.  Contributed by Devaraj K


git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@1096022 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

diff --git a/CHANGES.txt b/CHANGES.txt
index 39e8af9..9f26015 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2198,3 +2198,5 @@
 
     MAPREDUCE-1856. Extract a subset of tests for smoke (DOA) validation (cos)
 
+    MAPREDUCE-2317. Fix a NPE in HadoopArchives.  (Devaraj K via szetszwo)
+

src/tools/org/apache/hadoop/tools/HadoopArchives.java

diff --git a/src/tools/org/apache/hadoop/tools/HadoopArchives.java b/src/tools/org/apache/hadoop/tools/HadoopArchives.java
index f7ea393..41d149e 100644
--- a/src/tools/org/apache/hadoop/tools/HadoopArchives.java
+++ b/src/tools/org/apache/hadoop/tools/HadoopArchives.java
@@ -367,16 +367,18 @@
         }
         else {
           Path parent = p.getParent();
-          if (allpaths.containsKey(parent.toString())) {
-            HashSet<String> children = allpaths.get(parent.toString());
-            children.add(p.getName());
+          if (null != parent) {
+            if (allpaths.containsKey(parent.toString())) {
+              HashSet<String> children = allpaths.get(parent.toString());
+              children.add(p.getName());
+            } 
+            else {
+              HashSet<String> children = new HashSet<String>();
+              children.add(p.getName());
+              allpaths.put(parent.toString(), children);
+            }
+            parents.add(parent);
           }
-          else {
-            HashSet<String> children = new HashSet<String>();
-            children.add(p.getName());
-            allpaths.put(parent.toString(), children);
-          }
-          parents.add(parent);
         }
       }
       justDirs = parents;