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

[#1772] Make sure ChannelOutboundBuffer.recycle() does also reset unflushed, flushed and tail.

Browse Source 
This fix a IndexOutOfBoundsException which as triggered if recycle() did cut down the buffer[] to the initial size.
This commit is contained in:
Norman Maurer 2013-08-23 09:01:16 +02:00
parent 9fd35d09a2
commit 206dc2a391
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
transport/src/main/java/io/netty/channel/ChannelOutboundBuffer.java
View File

@ -146,7 +146,7 @@ public final class ChannelOutboundBuffer {
} }
void addFlush() { void addFlush() {
this.unflushed = this.tail; unflushed = tail;
} }
/** /**
@ -271,7 +271,7 @@ public final class ChannelOutboundBuffer {
return false; return false;
} }
Entry e = buffer[this.flushed]; Entry e = buffer[flushed];
Object msg = e.msg; Object msg = e.msg;
if (msg == null) { if (msg == null) {
return false; return false;
@ -282,7 +282,7 @@ public final class ChannelOutboundBuffer {
e.clear(); e.clear();
this.flushed = flushed + 1 & buffer.length - 1; flushed = flushed + 1 & buffer.length - 1;
safeRelease(msg); safeRelease(msg);
@ -443,7 +443,7 @@ public final class ChannelOutboundBuffer {
} }
// Release all unflushed messages. // Release all unflushed messages.
final int unflushedCount = this.tail - this.unflushed & buffer.length - 1; final int unflushedCount = tail - unflushed & buffer.length - 1;
try { try {
for (int i = 0; i < unflushedCount; i++) { for (int i = 0; i < unflushedCount; i++) {
Entry e = buffer[unflushed + i & buffer.length - 1]; Entry e = buffer[unflushed + i & buffer.length - 1];
@ -486,20 +486,26 @@ public final class ChannelOutboundBuffer {
} }
public void recycle() { public void recycle() {
if (this.buffer.length > INITIAL_CAPACITY) { if (buffer.length > INITIAL_CAPACITY) {
Entry[] e = new Entry[INITIAL_CAPACITY]; Entry[] e = new Entry[INITIAL_CAPACITY];
System.arraycopy(this.buffer, 0, e, 0, INITIAL_CAPACITY); System.arraycopy(buffer, 0, e, 0, INITIAL_CAPACITY);
this.buffer = e; buffer = e;
} }
if (this.nioBuffers.length > INITIAL_CAPACITY) { if (nioBuffers.length > INITIAL_CAPACITY) {
this.nioBuffers = new ByteBuffer[INITIAL_CAPACITY]; nioBuffers = new ByteBuffer[INITIAL_CAPACITY];
} else { } else {
// null out the nio buffers array so the can be GC'ed // null out the nio buffers array so the can be GC'ed
// https://github.com/netty/netty/issues/1763 // https://github.com/netty/netty/issues/1763
Arrays.fill(nioBuffers, null); Arrays.fill(nioBuffers, null);
} }
// reset flushed, unflushed and tail
// See https://github.com/netty/netty/issues/1772
flushed = 0;
unflushed = 0;
tail = 0;
// Set the channel to null so it can be GC'ed ASAP // Set the channel to null so it can be GC'ed ASAP
channel = null; channel = null;