From cd8e2576b4404ab7491fd85ee3c82eb499b75b00 Mon Sep 17 00:00:00 2001 From: John Fallows Date: Mon, 13 Aug 2012 23:16:07 -0700 Subject: [PATCH 1/2] Ensure unmodified buffer delivered via pipeline after read completes but before next read begins. --- .../java/io/netty/channel/socket/aio/AioSocketChannel.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/transport/src/main/java/io/netty/channel/socket/aio/AioSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/aio/AioSocketChannel.java index c82269b82a..55db6357a7 100755 --- a/transport/src/main/java/io/netty/channel/socket/aio/AioSocketChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/aio/AioSocketChannel.java @@ -308,7 +308,6 @@ public class AioSocketChannel extends AbstractAioChannel implements SocketChanne // This is needed as the ByteBuffer and the ByteBuf does not share // each others index byteBuf.writerIndex(byteBuf.writerIndex() + localReadAmount); - expandReadBuffer(byteBuf); read = true; } else if (localReadAmount < 0) { @@ -372,9 +371,9 @@ public class AioSocketChannel extends AbstractAioChannel implements SocketChanne @Override protected void completed0(Void result, AioSocketChannel channel) { - channel.beginRead(); ((AbstractAioUnsafe) channel.unsafe()).connectSuccess(); channel.pipeline().fireChannelActive(); + channel.beginRead(); } @Override From 3cce40bd799077e63318ec2b979e605a6021438d Mon Sep 17 00:00:00 2001 From: John Fallows Date: Sun, 19 Aug 2012 13:49:09 -0700 Subject: [PATCH 2/2] Suppress unchecked cast warnings for config options. --- .../netty/channel/socket/aio/AioServerSocketChannelConfig.java | 1 + .../java/io/netty/channel/socket/aio/AioSocketChannelConfig.java | 1 + 2 files changed, 2 insertions(+) diff --git a/transport/src/main/java/io/netty/channel/socket/aio/AioServerSocketChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/aio/AioServerSocketChannelConfig.java index 990e8172b5..3f59d9328a 100644 --- a/transport/src/main/java/io/netty/channel/socket/aio/AioServerSocketChannelConfig.java +++ b/transport/src/main/java/io/netty/channel/socket/aio/AioServerSocketChannelConfig.java @@ -46,6 +46,7 @@ final class AioServerSocketChannelConfig extends DefaultChannelConfig } @Override + @SuppressWarnings("unchecked") public T getOption(ChannelOption option) { if (option == SO_RCVBUF) { return (T) Integer.valueOf(getReceiveBufferSize()); diff --git a/transport/src/main/java/io/netty/channel/socket/aio/AioSocketChannelConfig.java b/transport/src/main/java/io/netty/channel/socket/aio/AioSocketChannelConfig.java index ae1be50145..ba0481c62d 100644 --- a/transport/src/main/java/io/netty/channel/socket/aio/AioSocketChannelConfig.java +++ b/transport/src/main/java/io/netty/channel/socket/aio/AioSocketChannelConfig.java @@ -57,6 +57,7 @@ final class AioSocketChannelConfig extends DefaultChannelConfig } @Override + @SuppressWarnings("unchecked") public T getOption(ChannelOption option) { if (option == SO_RCVBUF) { return (T) Integer.valueOf(getReceiveBufferSize());