svn commit: r817763 - in /hadoop/hbase/branches/0.20: CHANGES.txt src/java/org/apache/hadoop/hbase/client/Result.java

[stack]

Author: stack
Date: Tue Sep 22 18:50:07 2009
New Revision: 817763

URL: http://svn.apache.org/viewvc?rev=817763&view=rev
Log:
HBASE-1856 HBASE-1765 broke MapReduce when using Result.list()

Modified:
    hadoop/hbase/branches/0.20/CHANGES.txt
    
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/client/Result.java

Modified: hadoop/hbase/branches/0.20/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/CHANGES.txt?rev=817763&r1=817762&r2=817763&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.20/CHANGES.txt Tue Sep 22 18:50:07 2009
@@ -23,6 +23,8 @@
                messages to pass master, even if we failed to deliver them
    HBASE-1815  HBaseClient can get stuck in an infinite loop while attempting
                to contact a failed regionserver
+   HBASE-1856  HBASE-1765 broke MapReduce when using Result.list()
+               (Lars George via Stack)
 
   IMPROVEMENTS
    HBASE-1819  Update to 0.20.1 hadoop and zk 3.2.1

Modified: 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/client/Result.java
URL: 
http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/client/Result.java?rev=817763&r1=817762&r2=817763&view=diff
==============================================================================
--- 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/client/Result.java 
(original)
+++ 
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/client/Result.java 
Tue Sep 22 18:50:07 2009
@@ -452,6 +452,7 @@
   throws IOException {
     familyMap = null;
     row = null;
+    this.kvs = null;
     int totalBuffer = in.readInt();
     if(totalBuffer == 0) {
       bytes = null;
@@ -464,7 +465,7 @@
   
   //Create KeyValue[] when needed
   private void readFields() {
-    if(bytes == null) {
+    if (bytes == null) {
       this.kvs = new KeyValue[0];
       return;
     }