Repository: hbase Updated Branches: refs/heads/branch-2 0773209dd -> 0f6ff895e
HBASE-20350 NullPointerException in Scanner during close() Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0f6ff895 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0f6ff895 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0f6ff895 Branch: refs/heads/branch-2 Commit: 0f6ff895e9c9d20cba10dbca4c8012ceca6d2273 Parents: 0773209 Author: Apekshit Sharma <a...@apache.org> Authored: Fri Apr 6 20:24:45 2018 -0700 Committer: Michael Stack <st...@apache.org> Committed: Wed Apr 11 14:34:23 2018 -0700 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/0f6ff895/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java index 053ae99..b0f42d7 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/KeyValueHeap.java @@ -224,8 +224,8 @@ public class KeyValueHeap extends NonReversedNonLazyKeyValueScanner this.current.close(); } if (this.heap != null) { - KeyValueScanner scanner; - while ((scanner = this.heap.poll()) != null) { + // Order of closing the scanners shouldn't matter here, so simply iterate and close them. + for (KeyValueScanner scanner : heap) { scanner.close(); } }
