You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ra...@apache.org on 2010/07/08 03:22:09 UTC
svn commit: r961549 - in /hbase/trunk: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
Author: rawson
Date: Thu Jul 8 01:22:08 2010
New Revision: 961549
URL: http://svn.apache.org/viewvc?rev=961549&view=rev
Log:
HBASE-2797 Another NPE in ReadWriteConsistencyControl
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=961549&r1=961548&r2=961549&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu Jul 8 01:22:08 2010
@@ -429,6 +429,7 @@ Release 0.21.0 - Unreleased
HBASE-2806 DNS hiccups cause uncaught NPE in HServerAddress#getBindAddress
(Benoit Sigoure via Stack)
HBASE-2806 (small compile fix via jgray)
+ HBASE-2797 Another NPE in ReadWriteConsistencyControl
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java?rev=961549&r1=961548&r2=961549&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java Thu Jul 8 01:22:08 2010
@@ -169,15 +169,9 @@ class StoreScanner implements KeyValueSc
}
public synchronized KeyValue peek() {
- try {
- checkReseek();
- } catch (IOException e) {
- throw new RuntimeException("IOE conversion", e);
- }
if (this.heap == null) {
- return null;
+ return this.lastTop;
}
-
return this.heap.peek();
}
Modified: hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java?rev=961549&r1=961548&r2=961549&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java (original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java Thu Jul 8 01:22:08 2010
@@ -452,6 +452,8 @@ public class TestStoreScanner extends Te
scan.updateReaders();
scan.updateReaders();
+
+ scan.peek();
}