Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-2797 Another NPE in ReadWriteConsistencyControl 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@961549 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ryan Rawson 2010-07-08 01:22:08 +00:00
parent c2c41f0439
commit b5a5aa6381
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -429,6 +429,7 @@ Release 0.21.0 - Unreleased
HBASE-2806 DNS hiccups cause uncaught NPE in HServerAddress#getBindAddress HBASE-2806 DNS hiccups cause uncaught NPE in HServerAddress#getBindAddress
(Benoit Sigoure via Stack) (Benoit Sigoure via Stack)
HBASE-2806 (small compile fix via jgray) HBASE-2806 (small compile fix via jgray)
HBASE-2797 Another NPE in ReadWriteConsistencyControl
IMPROVEMENTS IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable HBASE-1760 Cleanup TODOs in HTable

8
src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
View File

@ -169,15 +169,9 @@ class StoreScanner implements KeyValueScanner, InternalScanner, ChangedReadersOb
} }
public synchronized KeyValue peek() { public synchronized KeyValue peek() {
try {
checkReseek();
} catch (IOException e) {
throw new RuntimeException("IOE conversion", e);
}
if (this.heap == null) { if (this.heap == null) {
return null; return this.lastTop;
} }
return this.heap.peek(); return this.heap.peek();
} }

2
src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreScanner.java
View File

@ -452,6 +452,8 @@ public class TestStoreScanner extends TestCase {
scan.updateReaders(); scan.updateReaders();
scan.updateReaders(); scan.updateReaders();
scan.peek();
} }