浏览代码

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.4@1589535 13f79535-47bb-0310-9956-ffa450edef68

Vinod Kumar Vavilapalli 11 年之前
父节点
当前提交
27203efec1

+ 3 - 0
hadoop-mapreduce-project/CHANGES.txt

@@ -39,6 +39,9 @@ Release 2.4.1 - UNRELEASED
     MAPREDUCE-5841. uber job doesn't terminate on getting mapred job kill
     MAPREDUCE-5841. uber job doesn't terminate on getting mapred job kill
     (Sangjin Lee via jlowe)
     (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 
 Release 2.4.0 - 2014-04-07 
 
 
   INCOMPATIBLE CHANGES
   INCOMPATIBLE CHANGES

+ 1 - 0
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 @@ public class TestMRKeyValueTextInputFormat {
     while (reader.nextKeyValue()) {
     while (reader.nextKeyValue()) {
       result.add(new Text(reader.getCurrentValue()));
       result.add(new Text(reader.getCurrentValue()));
     }
     }
+    reader.close();
     return result;
     return result;
   }
   }