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

NioDatagramChannel invalid usage of internalNioBuffer

Browse Source 
Motivation:
NioDatagramChannel attempts to unpack a AddressedEnvelope and unconditionally uses internalNioBuffer. However if the ByteBuf is a CompositeByteBuf with more than 1 components, the write will fail and throw an exception.

Modifications:
- NioDatagramChannel should check the nioBufferCount before attempting
to use internalNioBuffer

Result:
No more failure to write UDP packets on NIO when a CompositeByteBuf is
used.
This commit is contained in:
Scott Mitchell 2018-02-12 09:31:36 -08:00 committed by GitHub
parent 8b273983f0
commit 7928a6fef3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
transport/src/main/java/io/netty/channel/socket/nio/NioDatagramChannel.java
View File

@ -286,7 +286,8 @@ public final class NioDatagramChannel
return true; return true;
} }
final ByteBuffer nioData = data.internalNioBuffer(data.readerIndex(), dataLen); final ByteBuffer nioData = data.nioBufferCount() == 1 ? data.internalNioBuffer(data.readerIndex(), dataLen)
: data.nioBuffer(data.readerIndex(), dataLen);
final int writtenBytes; final int writtenBytes;
if (remoteAddress != null) { if (remoteAddress != null) {
writtenBytes = javaChannel().send(nioData, remoteAddress); writtenBytes = javaChannel().send(nioData, remoteAddress);