You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by en...@apache.org on 2009/02/23 11:54:06 UTC
svn commit: r746957 - in /hadoop/core/branches/branch-0.20: CHANGES.txt
src/core/org/apache/hadoop/io/MapWritable.java
Author: enis
Date: Mon Feb 23 10:54:05 2009
New Revision: 746957
URL: http://svn.apache.org/viewvc?rev=746957&view=rev
Log:
Merge r746955:746956 from trunk to branch 0.20. Fixes HADOOP-5142.
Modified:
hadoop/core/branches/branch-0.20/CHANGES.txt
hadoop/core/branches/branch-0.20/src/core/org/apache/hadoop/io/MapWritable.java
Modified: hadoop/core/branches/branch-0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/CHANGES.txt?rev=746957&r1=746956&r2=746957&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.20/CHANGES.txt Mon Feb 23 10:54:05 2009
@@ -648,6 +648,9 @@
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
Modified: hadoop/core/branches/branch-0.20/src/core/org/apache/hadoop/io/MapWritable.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.20/src/core/org/apache/hadoop/io/MapWritable.java?rev=746957&r1=746956&r2=746957&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.20/src/core/org/apache/hadoop/io/MapWritable.java (original)
+++ hadoop/core/branches/branch-0.20/src/core/org/apache/hadoop/io/MapWritable.java Mon Feb 23 10:54:05 2009
@@ -99,7 +99,7 @@
/** {@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());
}
}