diff --git a/conf/hbase-site.xml b/conf/hbase-site.xml deleted file mode 100644 index c516ac7..0000000 --- a/conf/hbase-site.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - diff --git a/conf/hbase-site.xml b/conf/hbase-site.xml new file mode 120000 index 0000000..d2f16a0 --- /dev/null +++ b/conf/hbase-site.xml @@ -0,0 +1 @@ +/etc/hbase/conf/hbase-site.xml \ No newline at end of file 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..47df7fc 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,8 +5913,11 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi "caller disconnected"); } } - - // Let's see what we have in the storeHeap. + 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(); boolean stopRow = isStopRow(current); @@ -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.