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

Fix a bug in ChannelOutboundBuffer.nioBuffers()

Browse Source 
Related issue: #2717, #2710, #2704, #2693

Motivation:

When ChannelOutboundBuffer.nioBuffers() iterates over the linked list of
entries, it is not supposed to visit unflushed entries, but it does.

Modifications:

- Make sure ChannelOutboundBuffer.nioBuffers() stops the iteration before
  it visits an unflushed entry
- Add isFlushedEntry() to reduce the chance of the similar mistakes

Result:

Another regression is gone.
This commit is contained in:
Trustin Lee 2014-07-31 15:25:09 -07:00
parent 8ee3575e72
commit d6f0d12a86
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -356,7 +356,7 @@ public final class ChannelOutboundBuffer {
final InternalThreadLocalMap threadLocalMap = InternalThreadLocalMap.get(); final InternalThreadLocalMap threadLocalMap = InternalThreadLocalMap.get();
ByteBuffer[] nioBuffers = NIO_BUFFERS.get(threadLocalMap); ByteBuffer[] nioBuffers = NIO_BUFFERS.get(threadLocalMap);
Entry entry = flushedEntry; Entry entry = flushedEntry;
while (entry != null && entry.msg instanceof ByteBuf) { while (isFlushedEntry(entry) && entry.msg instanceof ByteBuf) {
if (!entry.cancelled) { if (!entry.cancelled) {
ByteBuf buf = (ByteBuf) entry.msg; ByteBuf buf = (ByteBuf) entry.msg;
final int readerIndex = buf.readerIndex(); final int readerIndex = buf.readerIndex();
@ -586,7 +586,11 @@ public final class ChannelOutboundBuffer {
} }
} }
entry = entry.next; entry = entry.next;
} while (entry != null && entry != unflushedEntry); } while (isFlushedEntry(entry));
}
private boolean isFlushedEntry(Entry e) {
return e != null && e != unflushedEntry;
} }
public interface MessageProcessor { public interface MessageProcessor {