From c379e102ddab1b83fd69e4492a40c9901fb50675 Mon Sep 17 00:00:00 2001 From: Eric Yang Date: Mon, 15 Dec 2014 19:39:41 -0800 Subject: [PATCH] MAPREDUCE-6191. Improve clearing stale state of Java serialization testcase. (Sam Liu via Eric Yang) --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/mapred/TestJavaSerialization.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 945d95c4785..41fdb4f2958 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -94,6 +94,9 @@ Trunk (Unreleased) BUG FIXES + MAPREDUCE-6191. Improve clearing stale state of Java serialization + testcase. (Sam Liu via Eric Yang) + MAPREDUCE-5714. Removed forceful JVM exit in shutDownJob. (Jinghui Wang via Eric Yang) diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java index 4dea0d79175..265118a70f6 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java @@ -81,7 +81,7 @@ public class TestJavaSerialization extends TestCase { } private void cleanAndCreateInput(FileSystem fs) throws IOException { - fs.delete(INPUT_FILE, true); + fs.delete(INPUT_DIR, true); fs.delete(OUTPUT_DIR, true); OutputStream os = fs.create(INPUT_FILE);