svn commit: r1128906 - /hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Put.java

[apurtell]

Author: apurtell
Date: Sun May 29 17:06:32 2011
New Revision: 1128906

URL: http://svn.apache.org/viewvc?rev=1128906&view=rev
Log:
HBASE-3921 Allow adding arbitrary blobs to Put; fix accidental commit from 
wrong working file

Modified:
    hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Put.java

Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Put.java
URL: 
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Put.java?rev=1128906&r1=1128905&r2=1128906&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Put.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/client/Put.java Sun May 
29 17:06:32 2011
@@ -529,9 +529,9 @@ public class Put implements HeapSize, Wr
     }
     if (attributes != null) {
       heapsize += ClassSize.align(this.attributes.size() * 
ClassSize.MAP_ENTRY);
-      for(Map.Entry<byte [], List<KeyValue>> entry : 
this.familyMap.entrySet()) {
-        heapsize += ClassSize.align(ClassSize.STRING + entry.getKey().length);
-        heapsize += ClassSize.align(ClassSize.ARRAY + entry.getValue().size());
+      for(Map.Entry<String, byte[]> entry : this.attributes.entrySet()) {
+        heapsize += ClassSize.align(ClassSize.STRING + 
entry.getKey().length());
+        heapsize += ClassSize.align(ClassSize.ARRAY + entry.getValue().length);
       }
     }
     return ClassSize.align((int)heapsize);