diff --git a/src/java/org/apache/hadoop/hbase/client/HTable.java b/src/java/org/apache/hadoop/hbase/client/HTable.java index 5010554..4f680ae 100644 --- a/src/java/org/apache/hadoop/hbase/client/HTable.java +++ b/src/java/org/apache/hadoop/hbase/client/HTable.java @@ -1865,9 +1865,16 @@ public class HTable { if(!scan.hasFilter()) { return false; } - // Let the filter see current row. - scan.getFilter().filterRowKey(endKey, 0, endKey.length); - return scan.getFilter().filterAllRemaining(); + if (scan.getFilter() != null) { + // Let the filter see current row. + scan.getFilter().filterRowKey(endKey, 0, endKey.length); + return scan.getFilter().filterAllRemaining(); + } + if (scan.getOldFilter() != null) { + scan.getOldFilter().filterRowKey(endKey, 0, endKey.length); + return scan.getOldFilter().filterAllRemaining(); + } + return false; //unlikely. } public Result next() throws IOException {