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

Use proper buffer factory in OioDatagramWorker

Browse Source
This commit is contained in:
Trustin Lee 2009-10-16 04:39:20 +00:00
parent 7a06c35238
commit c7c2c71935
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/jboss/netty/channel/socket/oio/OioDatagramWorker.java
View File

@ -22,10 +22,9 @@ import java.net.DatagramPacket;
import java.net.MulticastSocket;
import java.net.SocketAddress;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.buffer.ChannelBufferFactory;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelFuture;
import org.jboss.netty.channel.ReceiveBufferSizePredictor;
@ -67,6 +66,9 @@ class OioDatagramWorker implements Runnable {
ReceiveBufferSizePredictor predictor =
channel.getConfig().getReceiveBufferSizePredictor();
ChannelBufferFactory bufferFactory =
channel.getConfig().getBufferFactory();
byte[] buf = new byte[predictor.nextReceiveBufferSize()];
DatagramPacket packet = new DatagramPacket(buf, buf.length);
@ -83,16 +85,10 @@ class OioDatagramWorker implements Runnable {
break;
}
ChannelBuffer buffer;
ByteOrder endianness = channel.getConfig().getBufferFactory().getDefaultOrder();
int readBytes = packet.getLength();
if (readBytes == buf.length) {
buffer = ChannelBuffers.wrappedBuffer(endianness, buf);
} else {
buffer = ChannelBuffers.wrappedBuffer(endianness, buf, 0, readBytes);
}
fireMessageReceived(channel, buffer, packet.getSocketAddress());
fireMessageReceived(
channel,
bufferFactory.getBuffer(buf, 0, packet.getLength()),
packet.getSocketAddress());
}
// Setting the workerThread to null will prevent any channel