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 yj...@apache.org on 2015/03/25 23:47:03 UTC
hadoop git commit: HADOOP-11724. DistCp throws NPE when the target
directory is root. (Lei Eddy Xu via Yongjun Zhang)
Repository: hadoop
Updated Branches:
refs/heads/trunk fc1031af7 -> 44809b808
HADOOP-11724. DistCp throws NPE when the target directory is root. (Lei Eddy Xu via Yongjun Zhang)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/44809b80
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/44809b80
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/44809b80
Branch: refs/heads/trunk
Commit: 44809b80814d5520a73d5609d0f73a13eb2360ac
Parents: fc1031a
Author: Yongjun Zhang <yz...@cloudera.com>
Authored: Wed Mar 25 15:45:45 2015 -0700
Committer: Yongjun Zhang <yz...@cloudera.com>
Committed: Wed Mar 25 15:45:45 2015 -0700
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++
.../main/java/org/apache/hadoop/tools/mapred/CopyCommitter.java | 3 +++
2 files changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/44809b80/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 46dfee4..2e26b0a 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -469,6 +469,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-10027. *Compressor_deflateBytesDirect passes instance instead of
jclass to GetStaticObjectField. (Hui Zheng via cnauroth)
+ HADOOP-11724. DistCp throws NPE when the target directory is root.
+ (Lei Eddy Xu via Yongjun Zhang)
+
Release 2.7.0 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/44809b80/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyCommitter.java
----------------------------------------------------------------------
diff --git a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyCommitter.java b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyCommitter.java
index f36ef77..9ec57f4 100644
--- a/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyCommitter.java
+++ b/hadoop-tools/hadoop-distcp/src/main/java/org/apache/hadoop/tools/mapred/CopyCommitter.java
@@ -133,6 +133,9 @@ public class CopyCommitter extends FileOutputCommitter {
private void deleteAttemptTempFiles(Path targetWorkPath,
FileSystem targetFS,
String jobId) throws IOException {
+ if (targetWorkPath == null) {
+ return;
+ }
FileStatus[] tempFiles = targetFS.globStatus(
new Path(targetWorkPath, ".distcp.tmp." + jobId.replaceAll("job","attempt") + "*"));