Repository: hadoop Updated Branches: refs/heads/branch-2 5a1531fff -> 386e62ace
MAPREDUCE-6261. NullPointerException if MapOutputBuffer.flush invoked twice. Contributed by Tsuyoshi OZAWA (cherry picked from commit 4981d082d4f3c82d1c2c900c7488b83bf20301cc) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/386e62ac Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/386e62ac Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/386e62ac Branch: refs/heads/branch-2 Commit: 386e62ace38502399500aabf70325892eb179ee5 Parents: 5a1531f Author: Jason Lowe <[email protected]> Authored: Wed Feb 18 19:28:02 2015 +0000 Committer: Jason Lowe <[email protected]> Committed: Wed Feb 18 19:28:45 2015 +0000 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../src/main/java/org/apache/hadoop/mapred/MapTask.java | 4 ++++ 2 files changed, 7 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/386e62ac/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 1332cd7..79c14ca 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -137,6 +137,9 @@ Release 2.7.0 - UNRELEASED MAPREDUCE-4286. TestClientProtocolProviderImpls passes on failure conditions. (Devaraj K via ozawa) + MAPREDUCE-6261. NullPointerException if MapOutputBuffer.flush invoked + twice (Tsuyoshi OZAWA via jlowe) + Release 2.6.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/386e62ac/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java index 1a4901b..8094317 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/MapTask.java @@ -1458,6 +1458,10 @@ public class MapTask extends Task { public void flush() throws IOException, ClassNotFoundException, InterruptedException { LOG.info("Starting flush of map output"); + if (kvbuffer == null) { + LOG.info("kvbuffer is null. Skipping flush."); + return; + } spillLock.lock(); try { while (spillInProgress) {
