From 9c17304755a37283069621f780201e31917ecf5c Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Fri, 17 Aug 2012 12:18:00 +0900 Subject: [PATCH] Use different EventLoopGroup for AIO transport tests - plus tiny cleanup --- .../testsuite/transport/socket/SocketTestPermutation.java | 7 ++++--- .../netty/channel/socket/aio/AioServerSocketChannel.java | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java b/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java index 34ab5d1505..1891372eb9 100644 --- a/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java +++ b/testsuite/src/test/java/io/netty/testsuite/transport/socket/SocketTestPermutation.java @@ -54,10 +54,11 @@ final class SocketTestPermutation { sbfs.add(new Factory() { @Override public ServerBootstrap newInstance() { - AioEventLoopGroup loop = new AioEventLoopGroup(); + AioEventLoopGroup parentGroup = new AioEventLoopGroup(); + AioEventLoopGroup childGroup = new AioEventLoopGroup(); return new ServerBootstrap(). - group(loop). - channel(new AioServerSocketChannel(loop)); + group(parentGroup, childGroup). + channel(new AioServerSocketChannel(parentGroup, childGroup)); } }); sbfs.add(new Factory() { diff --git a/transport/src/main/java/io/netty/channel/socket/aio/AioServerSocketChannel.java b/transport/src/main/java/io/netty/channel/socket/aio/AioServerSocketChannel.java index 4a83008d7b..147dff177a 100755 --- a/transport/src/main/java/io/netty/channel/socket/aio/AioServerSocketChannel.java +++ b/transport/src/main/java/io/netty/channel/socket/aio/AioServerSocketChannel.java @@ -43,7 +43,7 @@ public class AioServerSocketChannel extends AbstractAioChannel implements Server private final AioEventLoopGroup childGroup; private final AioServerSocketChannelConfig config; private boolean closed; - private AtomicBoolean readSuspended = new AtomicBoolean(); + private final AtomicBoolean readSuspended = new AtomicBoolean(); private final Runnable acceptTask = new Runnable() { @@ -68,7 +68,7 @@ public class AioServerSocketChannel extends AbstractAioChannel implements Server public AioServerSocketChannel(AioEventLoopGroup parentGroup, AioEventLoopGroup childGroup) { super(null, null, parentGroup, newSocket(parentGroup.group)); this.childGroup = childGroup; - this.config = new AioServerSocketChannelConfig(javaChannel()); + config = new AioServerSocketChannelConfig(javaChannel()); } @Override