From ccd88596f330068f45548181392ad2db30340be8 Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Mon, 14 Jul 2014 11:40:27 +0200 Subject: [PATCH] [#2653] Remove uncessary range checks for performance reasons Motivation: I introduced range checks as part of 6c47cc97111146396d2daf1a97051135d2eaf69e in some places. Unfortunally I also added some where these are not needed and so caused a performance regression. Modification: Remove range checks where not needed Result: Fixed performance regression. --- buffer/src/main/java/io/netty/buffer/AbstractByteBuf.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/buffer/src/main/java/io/netty/buffer/AbstractByteBuf.java b/buffer/src/main/java/io/netty/buffer/AbstractByteBuf.java index d584bb9343..cdba82c64c 100644 --- a/buffer/src/main/java/io/netty/buffer/AbstractByteBuf.java +++ b/buffer/src/main/java/io/netty/buffer/AbstractByteBuf.java @@ -998,17 +998,17 @@ public abstract class AbstractByteBuf extends ByteBuf { public int forEachByte(ByteBufProcessor processor) { int index = readerIndex; int length = writerIndex - index; + ensureAccessible(); return forEachByteAsc0(index, length, processor); } @Override public int forEachByte(int index, int length, ByteBufProcessor processor) { + checkIndex(index, length); return forEachByteAsc0(index, length, processor); } private int forEachByteAsc0(int index, int length, ByteBufProcessor processor) { - checkIndex(index, length); - if (processor == null) { throw new NullPointerException("processor"); } @@ -1038,16 +1038,18 @@ public abstract class AbstractByteBuf extends ByteBuf { public int forEachByteDesc(ByteBufProcessor processor) { int index = readerIndex; int length = writerIndex - index; + ensureAccessible(); return forEachByteDesc0(index, length, processor); } @Override public int forEachByteDesc(int index, int length, ByteBufProcessor processor) { + checkIndex(index, length); + return forEachByteDesc0(index, length, processor); } private int forEachByteDesc0(int index, int length, ByteBufProcessor processor) { - checkIndex(index, length); if (processor == null) { throw new NullPointerException("processor");