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

Fix a bug where ChannelOutboundBuffer.removeBytes() throws ClassCastException

Browse Source 
When a ChannelOutboundBuffer contains ByteBufs followed by a FileRegion,
removeBytes() will fail with a ClassCastException.  It should break the
loop instead.
This commit is contained in:
Trustin Lee 2014-08-15 09:54:32 -07:00
parent 23d15c71ee
commit 44d9163169
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -304,11 +304,13 @@ public final class ChannelOutboundBuffer {
*/ */
public void removeBytes(long writtenBytes) { public void removeBytes(long writtenBytes) {
for (;;) { for (;;) {
final ByteBuf buf = (ByteBuf) current(); Object msg = current();
if (buf == null) { if (!(msg instanceof ByteBuf)) {
assert writtenBytes == 0;
break; break;
} }
final ByteBuf buf = (ByteBuf) msg;
final int readerIndex = buf.readerIndex(); final int readerIndex = buf.readerIndex();
final int readableBytes = buf.writerIndex() - readerIndex; final int readableBytes = buf.writerIndex() - readerIndex;