You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by jd...@apache.org on 2009/12/28 19:41:52 UTC
svn commit: r894220 - in /hadoop/hbase/branches/0.20: CHANGES.txt
src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
Author: jdcryans
Date: Mon Dec 28 18:41:51 2009
New Revision: 894220
URL: http://svn.apache.org/viewvc?rev=894220&view=rev
Log:
HBASE-2026 NPE in StoreScanner on compaction
Modified:
hadoop/hbase/branches/0.20/CHANGES.txt
hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
Modified: hadoop/hbase/branches/0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/CHANGES.txt?rev=894220&r1=894219&r2=894220&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/CHANGES.txt (original)
+++ hadoop/hbase/branches/0.20/CHANGES.txt Mon Dec 28 18:41:51 2009
@@ -28,6 +28,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-1961 HBase EC2 scripts
Modified: hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java?rev=894220&r1=894219&r2=894220&view=diff
==============================================================================
--- hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java (original)
+++ hadoop/hbase/branches/0.20/src/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java Mon Dec 28 18:41:51 2009
@@ -247,6 +247,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