hadoop git commit: MAPREDUCE-6191. Improve clearing stale state of Java serialization testcase. (Sam Liu via Eric Yang)

[eyang]

Repository: hadoop
Updated Branches:
  refs/heads/trunk af006937e -> c379e102d


MAPREDUCE-6191. Improve clearing stale state of Java serialization
                testcase.  (Sam Liu via Eric Yang)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c379e102
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c379e102
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c379e102

Branch: refs/heads/trunk
Commit: c379e102ddab1b83fd69e4492a40c9901fb50675
Parents: af00693
Author: Eric Yang <ey...@apache.org>
Authored: Mon Dec 15 19:39:41 2014 -0800
Committer: Eric Yang <ey...@apache.org>
Committed: Mon Dec 15 19:39:41 2014 -0800

----------------------------------------------------------------------
 hadoop-mapreduce-project/CHANGES.txt                              | 3 +++
 .../test/java/org/apache/hadoop/mapred/TestJavaSerialization.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c379e102/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt 
b/hadoop-mapreduce-project/CHANGES.txt
index 945d95c..41fdb4f 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)
 

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c379e102/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJavaSerialization.java
----------------------------------------------------------------------
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 4dea0d7..265118a 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);