diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 9f6a03a..747f8f3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -5913,7 +5913,10 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi "caller disconnected"); } } - + if (storeHeap == null) { + // scanner is closed + throw new UnknownScannerException("Scanner was closed"); + } // Let's see what we have in the storeHeap. Cell current = this.storeHeap.peek(); @@ -5975,7 +5978,10 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi } return true; } - + if (storeHeap == null) { + // scanner is closed + throw new UnknownScannerException("Scanner was closed"); + } Cell nextKv = this.storeHeap.peek(); stopRow = nextKv == null || isStopRow(nextKv); // save that the row was empty before filters applied to it.