From e36d2dc3de7316d4196ac263400e29ed82ef220d Mon Sep 17 00:00:00 2001 From: Trustin Lee Date: Wed, 7 Jul 2010 07:55:37 +0000 Subject: [PATCH] Fixed issue: NETTY-331 (Regression NETTY-262: Server bootstrap bound channel pipeline has become immutable) * ServerBootstrap now always uses the default pipeline instead of the static one --- .../java/org/jboss/netty/bootstrap/ServerBootstrap.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java b/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java index 5a8d852970..c915a3b9a0 100644 --- a/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java +++ b/src/main/java/org/jboss/netty/bootstrap/ServerBootstrap.java @@ -41,7 +41,6 @@ import org.jboss.netty.channel.ChildChannelStateEvent; import org.jboss.netty.channel.ExceptionEvent; import org.jboss.netty.channel.ServerChannelFactory; import org.jboss.netty.channel.SimpleChannelUpstreamHandler; -import org.jboss.netty.channel.StaticChannelPipeline; /** * A helper class which creates a new server-side {@link Channel} and accepts @@ -271,15 +270,13 @@ public class ServerBootstrap extends Bootstrap { final BlockingQueue futureQueue = new LinkedBlockingQueue(); - ChannelPipeline bossPipeline; ChannelHandler binder = new Binder(localAddress, futureQueue); ChannelHandler parentHandler = getParentHandler(); + + ChannelPipeline bossPipeline = pipeline(); + bossPipeline.addLast("binder", binder); if (parentHandler != null) { - bossPipeline = pipeline(); - bossPipeline.addLast("binder", binder); bossPipeline.addLast("userHandler", parentHandler); - } else { - bossPipeline = new StaticChannelPipeline(binder); } Channel channel = getFactory().newChannel(bossPipeline);