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 sz...@apache.org on 2011/04/22 22:34:30 UTC
svn commit: r1096027 - in /hadoop/common/branches/branch-0.20: CHANGES.txt
src/tools/org/apache/hadoop/tools/HadoopArchives.java
Author: szetszwo
Date: Fri Apr 22 20:34:30 2011
New Revision: 1096027
URL: http://svn.apache.org/viewvc?rev=1096027&view=rev
Log:
MAPREDUCE-2317. Fix a NPE in HadoopArchives. Contributed by Devaraj K
Modified:
hadoop/common/branches/branch-0.20/CHANGES.txt
hadoop/common/branches/branch-0.20/src/tools/org/apache/hadoop/tools/HadoopArchives.java
Modified: hadoop/common/branches/branch-0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/CHANGES.txt?rev=1096027&r1=1096026&r2=1096027&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20/CHANGES.txt Fri Apr 22 20:34:30 2011
@@ -6,6 +6,8 @@ Release 0.20.4 - Unreleased
BUG FIXES
+ MAPREDUCE-2317. Fix a NPE in HadoopArchives. (Devaraj K via szetszwo)
+
IMPROVEMENTS
Release 0.20.3 - 2011-1-5
Modified: hadoop/common/branches/branch-0.20/src/tools/org/apache/hadoop/tools/HadoopArchives.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/tools/org/apache/hadoop/tools/HadoopArchives.java?rev=1096027&r1=1096026&r2=1096027&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/tools/org/apache/hadoop/tools/HadoopArchives.java (original)
+++ hadoop/common/branches/branch-0.20/src/tools/org/apache/hadoop/tools/HadoopArchives.java Fri Apr 22 20:34:30 2011
@@ -269,16 +269,18 @@ public class HadoopArchives implements T
}
else {
Path parent = p.getParent();
- 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);
+ 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);
}
- parents.add(parent);
}
}
justDirs = parents;