From d3a28355030f23758fccec7169318bd4d01b4355 Mon Sep 17 00:00:00 2001
From: Trustin Lee <trustin@gmail.com>
Date: Fri, 10 Aug 2012 20:26:04 +0900
Subject: [PATCH] Add ServerBootstrap.group() that takes a single group

---
 .../java/io/netty/example/localecho/LocalEcho.java   |  4 ++--
 .../transport/socket/SocketTestPermutation.java      |  2 +-
 .../java/io/netty/bootstrap/ServerBootstrap.java     | 12 ++++++++++++
 .../channel/local/LocalChannelRegistryTest.java      |  2 +-
 .../channel/local/LocalTransportThreadModelTest.java |  2 +-
 5 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/example/src/main/java/io/netty/example/localecho/LocalEcho.java b/example/src/main/java/io/netty/example/localecho/LocalEcho.java
index db573f2779..7a1410d73e 100644
--- a/example/src/main/java/io/netty/example/localecho/LocalEcho.java
+++ b/example/src/main/java/io/netty/example/localecho/LocalEcho.java
@@ -49,7 +49,7 @@ public class LocalEcho {
             // Note that we can use any event loop to ensure certain local channels
             // are handled by the same event loop thread which drives a certain socket channel
             // to reduce the communication latency between socket channels and local channels.
-            sb.group(new LocalEventLoopGroup(), new LocalEventLoopGroup())
+            sb.group(new LocalEventLoopGroup())
               .channel(new LocalServerChannel())
               .localAddress(addr)
               .handler(new ChannelInitializer<LocalServerChannel>() {
@@ -67,7 +67,7 @@ public class LocalEcho {
                   }
               });
 
-            cb.group(new NioEventLoopGroup())
+            cb.group(new NioEventLoopGroup()) // NIO event loops are also OK
               .channel(new LocalChannel())
               .remoteAddress(addr)
               .handler(new ChannelInitializer<LocalChannel>() {
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 e93e997471..34ab5d1505 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
@@ -56,7 +56,7 @@ final class SocketTestPermutation {
             public ServerBootstrap newInstance() {
                 AioEventLoopGroup loop = new AioEventLoopGroup();
                 return new ServerBootstrap().
-                                group(loop, loop).
+                                group(loop).
                                 channel(new AioServerSocketChannel(loop));
             }
         });
diff --git a/transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java b/transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java
index a66a6f6238..3b86b808c8 100644
--- a/transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java
+++ b/transport/src/main/java/io/netty/bootstrap/ServerBootstrap.java
@@ -63,6 +63,18 @@ public class ServerBootstrap {
     private ChannelHandler childHandler;
     private SocketAddress localAddress;
 
+    public ServerBootstrap group(EventLoopGroup group) {
+        if (group == null) {
+            throw new NullPointerException("group");
+        }
+        if (parentGroup != null) {
+            throw new IllegalStateException("parentGroup set already");
+        }
+        parentGroup = group;
+        childGroup = group;
+        return this;
+    }
+
     public ServerBootstrap group(EventLoopGroup parentGroup, EventLoopGroup childGroup) {
         if (parentGroup == null) {
             throw new NullPointerException("parentGroup");
diff --git a/transport/src/test/java/io/netty/channel/local/LocalChannelRegistryTest.java b/transport/src/test/java/io/netty/channel/local/LocalChannelRegistryTest.java
index c5e0c8ea93..b7eef46d2d 100644
--- a/transport/src/test/java/io/netty/channel/local/LocalChannelRegistryTest.java
+++ b/transport/src/test/java/io/netty/channel/local/LocalChannelRegistryTest.java
@@ -47,7 +47,7 @@ public class LocalChannelRegistryTest {
               .remoteAddress(addr)
               .handler(new TestHandler());
 
-            sb.group(new LocalEventLoopGroup(), new LocalEventLoopGroup())
+            sb.group(new LocalEventLoopGroup())
               .channel(new LocalServerChannel())
               .localAddress(addr)
               .childHandler(new ChannelInitializer<LocalChannel>() {
diff --git a/transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest.java b/transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest.java
index db0cff8153..df227a6a18 100644
--- a/transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest.java
+++ b/transport/src/test/java/io/netty/channel/local/LocalTransportThreadModelTest.java
@@ -57,7 +57,7 @@ public class LocalTransportThreadModelTest {
     public static void init() {
         // Configure a test server
         sb = new ServerBootstrap();
-        sb.group(new LocalEventLoopGroup(), new LocalEventLoopGroup())
+        sb.group(new LocalEventLoopGroup())
           .channel(new LocalServerChannel())
           .localAddress(LocalAddress.ANY)
           .childHandler(new ChannelInitializer<LocalChannel>() {