andreacavalli/netty5
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[#1821] Fix IndexOutOfBoundsException which was thrown if the last component was removed but other components was left

Browse Source
This commit is contained in:
Norman Maurer 2013-09-09 20:29:30 +02:00
parent 36c8ac5e5c
commit 451e91d142
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
buffer/src/main/java/io/netty/buffer/CompositeByteBuf.java
View File

@ -323,7 +323,8 @@ public class CompositeByteBuf extends AbstractReferenceCountedByteBuf {
} }
private void updateComponentOffsets(int cIndex) { private void updateComponentOffsets(int cIndex) {
if (components.isEmpty()) { int size = components.size();
if (size <= cIndex) {
return; return;
} }
@ -334,7 +335,7 @@ public class CompositeByteBuf extends AbstractReferenceCountedByteBuf {
cIndex ++; cIndex ++;
} }
for (int i = cIndex; i < components.size(); i ++) { for (int i = cIndex; i < size; i ++) {
Component prev = components.get(i - 1); Component prev = components.get(i - 1);
Component cur = components.get(i); Component cur = components.get(i);
cur.offset = prev.endOffset; cur.offset = prev.endOffset;

10
buffer/src/test/java/io/netty/buffer/AbstractCompositeByteBufTest.java
View File

@ -567,6 +567,16 @@ public abstract class AbstractCompositeByteBufTest extends AbstractByteBufTest {
assertEquals(0, freeLater(buf.duplicate()).readableBytes()); assertEquals(0, freeLater(buf.duplicate()).readableBytes());
} }
@Test
public void testRemoveLastComponentWithOthersLeft() {
CompositeByteBuf buf = freeLater(compositeBuffer());
buf.addComponent(wrappedBuffer(new byte[]{1, 2}));
buf.addComponent(wrappedBuffer(new byte[]{1, 2}));
assertEquals(2, buf.numComponents());
buf.removeComponent(1);
assertEquals(1, buf.numComponents());
}
@Override @Override
@Test @Test
public void testInternalNioBuffer() { public void testInternalNioBuffer() {