svn commit: r817762 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/client/Result.java

[st...@apache.org]

Author: stack
Date: Tue Sep 22 18:48:39 2009
New Revision: 817762

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

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

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=817762&r1=817761&r2=817762&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Tue Sep 22 18:48:39 2009
@@ -38,6 +38,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-1760  Cleanup TODOs in HTable

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