hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdcry...@apache.org
Subject svn commit: r894219 - in /hadoop/hbase/trunk: CHANGES.txt src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
Date Mon, 28 Dec 2009 18:41:02 GMT
Author: jdcryans
Date: Mon Dec 28 18:41:02 2009
New Revision: 894219

URL: http://svn.apache.org/viewvc?rev=894219&view=rev
Log:
HBASE-2026  NPE in StoreScanner on compaction

Modified:
    hadoop/hbase/trunk/CHANGES.txt
    hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java

Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=894219&r1=894218&r2=894219&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Mon Dec 28 18:41:02 2009
@@ -139,6 +139,7 @@
                its regions around
    HBASE-2065  Cannot disable a table if any of its region is opening 
                at the same time
+   HBASE-2026  NPE in StoreScanner on compaction
 
   IMPROVEMENTS
    HBASE-1760  Cleanup TODOs in HTable

Modified: hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java?rev=894219&r1=894218&r2=894219&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java (original)
+++ hadoop/hbase/trunk/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java Mon
Dec 28 18:41:02 2009
@@ -255,6 +255,7 @@
 
     // Reset the state of the Query Matcher and set to top row
     matcher.reset();
-    matcher.setRow(heap.peek().getRow());
+    KeyValue kv = heap.peek();
+    matcher.setRow((kv == null ? topKey : kv).getRow());
   }
 }
\ No newline at end of file



Mime
View raw message