Merge r746955:746956 from trunk to branch 0.20. Fixes HADOOP-5142.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.20@746957 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -648,6 +648,9 @@ Release 0.20.0 - Unreleased
     HADOOP-5241. Fixes a bug in disk-space resource estimation. Makes the estimation
     formula linear where blowUp = Total-Output/Total-Input. (Sharad Agarwal via ddas)
 
+    HADOOP-5142. Fix MapWritable#putAll to store key/value classes. 
+    (Doğacan Güney via enis)
+
 Release 0.19.1 - Unreleased
 
   IMPROVEMENTS

src/core/org/apache/hadoop/io/MapWritable.java

@@ -99,7 +99,7 @@ public class MapWritable extends AbstractMapWritable
   /** {@inheritDoc} */
   public void putAll(Map<? extends Writable, ? extends Writable> t) {
     for (Map.Entry<? extends Writable, ? extends Writable> e: t.entrySet()) {
-      instance.put(e.getKey(), e.getValue());
+      put(e.getKey(), e.getValue());
     }
   }