HBASE-1809 NPE thrown in BoundedRangeFileInputStream
git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@817910 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
23e790f50b
commit
873bb2b7c3
|
@ -42,6 +42,7 @@ Release 0.21.0 - Unreleased
|
||||||
(Lars George via Stack)
|
(Lars George via Stack)
|
||||||
HBASE-1857 WrongRegionException when setting region online after .META.
|
HBASE-1857 WrongRegionException when setting region online after .META.
|
||||||
split (Cosmin Lehane via Stack)
|
split (Cosmin Lehane via Stack)
|
||||||
|
HBASE-1809 NPE thrown in BoundedRangeFileInputStream
|
||||||
|
|
||||||
IMPROVEMENTS
|
IMPROVEMENTS
|
||||||
HBASE-1760 Cleanup TODOs in HTable
|
HBASE-1760 Cleanup TODOs in HTable
|
||||||
|
|
|
@ -1406,7 +1406,8 @@ public class Store implements HConstants, HeapSize {
|
||||||
// Column matching and version enforcement
|
// Column matching and version enforcement
|
||||||
QueryMatcher matcher = new QueryMatcher(get, this.family.getName(), columns,
|
QueryMatcher matcher = new QueryMatcher(get, this.family.getName(), columns,
|
||||||
this.ttl, keyComparator, versionsToReturn(get.getMaxVersions()));
|
this.ttl, keyComparator, versionsToReturn(get.getMaxVersions()));
|
||||||
|
this.lock.readLock().lock();
|
||||||
|
try {
|
||||||
// Read from memstore
|
// Read from memstore
|
||||||
if(this.memstore.get(matcher, result)) {
|
if(this.memstore.get(matcher, result)) {
|
||||||
// Received early-out from memstore
|
// Received early-out from memstore
|
||||||
|
@ -1434,6 +1435,9 @@ public class Store implements HConstants, HeapSize {
|
||||||
|
|
||||||
// Run a GET scan and put results into the specified list
|
// Run a GET scan and put results into the specified list
|
||||||
scanner.get(result);
|
scanner.get(result);
|
||||||
|
} finally {
|
||||||
|
this.lock.readLock().unlock();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue