diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/nio/MultiByteBuff.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/nio/MultiByteBuff.java index ab2b5ea..107bb3f 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/nio/MultiByteBuff.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/nio/MultiByteBuff.java @@ -472,7 +472,8 @@ public class MultiByteBuff extends ByteBuff { */ @Override public final boolean hasRemaining() { - return this.curItem.hasRemaining() || this.curItemIndex < this.items.length - 1; + return this.curItem.hasRemaining() || (this.curItemIndex < this.limitedItemIndex + && this.items[this.curItemIndex + 1].hasRemaining()); } /**