From b04bb049d29e8148854f9531e44371306a7dd3bb Mon Sep 17 00:00:00 2001 From: Vinod Kumar Vavilapalli Date: Wed, 23 Apr 2014 22:54:55 +0000 Subject: [PATCH] MAPREDUCE-5843. Fixed TestMRKeyValueTextInputFormat to not leak files and thus avoid failing on Windows. Contributed by Varun Vasudev. svn merge --ignore-ancestry -c 1589533 ../../trunk/ git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1589534 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../mapreduce/lib/input/TestMRKeyValueTextInputFormat.java | 1 + 2 files changed, 4 insertions(+) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 4798c91d3b4..90bce0490e1 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -88,6 +88,9 @@ Release 2.4.1 - UNRELEASED MAPREDUCE-5841. uber job doesn't terminate on getting mapred job kill (Sangjin Lee via jlowe) + MAPREDUCE-5843. Fixed TestMRKeyValueTextInputFormat to not leak files and + thus avoid failing on Windows. (Varun Vasudev via vinodkv) + Release 2.4.0 - 2014-04-07 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestMRKeyValueTextInputFormat.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestMRKeyValueTextInputFormat.java index 46298ae1ec7..f181c9c5456 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestMRKeyValueTextInputFormat.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/input/TestMRKeyValueTextInputFormat.java @@ -321,6 +321,7 @@ private static List readSplit(KeyValueTextInputFormat format, while (reader.nextKeyValue()) { result.add(new Text(reader.getCurrentValue())); } + reader.close(); return result; }