From 7c4ad004f6e1386012c93663767de62489562ee6 Mon Sep 17 00:00:00 2001
From: Norman Maurer <nmaurer@redhat.com>
Date: Wed, 5 Mar 2014 06:56:21 +0100
Subject: [PATCH] Ensure the HttpResponseEncoder is always placed before the
 HttpObjectAggregator. Part of [#2219]

---
 .../java/io/netty/example/http/cors/HttpServerInitializer.java | 3 +--
 .../example/http/file/HttpStaticFileServerInitializer.java     | 2 +-
 .../netty/example/http/websocketx/html5/WebSocketServer.java   | 2 +-
 .../websocketx/sslserver/WebSocketSslServerInitializer.java    | 3 +--
 .../websockets/autobahn/AutobahnServerInitializer.java         | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/example/src/main/java/io/netty/example/http/cors/HttpServerInitializer.java b/example/src/main/java/io/netty/example/http/cors/HttpServerInitializer.java
index ec4778f4fa..2297299b1d 100644
--- a/example/src/main/java/io/netty/example/http/cors/HttpServerInitializer.java
+++ b/example/src/main/java/io/netty/example/http/cors/HttpServerInitializer.java
@@ -75,10 +75,9 @@ public class HttpServerInitializer extends ChannelInitializer<SocketChannel> {
         ChannelPipeline pipeline = ch.pipeline();
 
         CorsConfig corsConfig = CorsConfig.anyOrigin().build();
-
+        pipeline.addLast("encoder", new HttpResponseEncoder());
         pipeline.addLast("decoder", new HttpRequestDecoder());
         pipeline.addLast("aggregator", new HttpObjectAggregator(65536));
-        pipeline.addLast("encoder", new HttpResponseEncoder());
         pipeline.addLast("chunkedWriter", new ChunkedWriteHandler());
         pipeline.addLast("cors", new CorsHandler(corsConfig));
         pipeline.addLast("handler", new OkResponseHandler());
diff --git a/example/src/main/java/io/netty/example/http/file/HttpStaticFileServerInitializer.java b/example/src/main/java/io/netty/example/http/file/HttpStaticFileServerInitializer.java
index 5edb82af5d..9076f1d338 100644
--- a/example/src/main/java/io/netty/example/http/file/HttpStaticFileServerInitializer.java
+++ b/example/src/main/java/io/netty/example/http/file/HttpStaticFileServerInitializer.java
@@ -34,9 +34,9 @@ public class HttpStaticFileServerInitializer extends ChannelInitializer<SocketCh
         //engine.setUseClientMode(false);
         //pipeline.addLast("ssl", new SslHandler(engine));
 
+        pipeline.addLast("encoder", new HttpResponseEncoder());
         pipeline.addLast("decoder", new HttpRequestDecoder());
         pipeline.addLast("aggregator", new HttpObjectAggregator(65536));
-        pipeline.addLast("encoder", new HttpResponseEncoder());
         pipeline.addLast("chunkedWriter", new ChunkedWriteHandler());
 
         pipeline.addLast("handler", new HttpStaticFileServerHandler(true)); // Specify false if SSL.
diff --git a/example/src/main/java/io/netty/example/http/websocketx/html5/WebSocketServer.java b/example/src/main/java/io/netty/example/http/websocketx/html5/WebSocketServer.java
index db4072280e..10e214cb51 100644
--- a/example/src/main/java/io/netty/example/http/websocketx/html5/WebSocketServer.java
+++ b/example/src/main/java/io/netty/example/http/websocketx/html5/WebSocketServer.java
@@ -68,9 +68,9 @@ public class WebSocketServer {
                 @Override
                 public void initChannel(final SocketChannel ch) throws Exception {
                     ch.pipeline().addLast(
+                        new HttpResponseEncoder(),
                         new HttpRequestDecoder(),
                         new HttpObjectAggregator(65536),
-                        new HttpResponseEncoder(),
                         new WebSocketServerProtocolHandler("/websocket"),
                         new CustomTextFrameHandler());
                 }
diff --git a/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerInitializer.java b/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerInitializer.java
index f8de25fc74..c624555320 100644
--- a/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerInitializer.java
+++ b/example/src/main/java/io/netty/example/http/websocketx/sslserver/WebSocketSslServerInitializer.java
@@ -35,10 +35,9 @@ public class WebSocketSslServerInitializer extends ChannelInitializer<SocketChan
         SSLEngine engine = WebSocketSslServerSslContext.getInstance().serverContext().createSSLEngine();
         engine.setUseClientMode(false);
         pipeline.addLast("ssl", new SslHandler(engine));
-
+        pipeline.addLast("encoder", new HttpResponseEncoder());
         pipeline.addLast("decoder", new HttpRequestDecoder());
         pipeline.addLast("aggregator", new HttpObjectAggregator(65536));
-        pipeline.addLast("encoder", new HttpResponseEncoder());
         pipeline.addLast("handler", new WebSocketSslServerHandler());
     }
 }
diff --git a/testsuite/src/test/java/io/netty/testsuite/websockets/autobahn/AutobahnServerInitializer.java b/testsuite/src/test/java/io/netty/testsuite/websockets/autobahn/AutobahnServerInitializer.java
index dd04b8769f..fef9c1c0d4 100644
--- a/testsuite/src/test/java/io/netty/testsuite/websockets/autobahn/AutobahnServerInitializer.java
+++ b/testsuite/src/test/java/io/netty/testsuite/websockets/autobahn/AutobahnServerInitializer.java
@@ -26,9 +26,9 @@ public class AutobahnServerInitializer extends ChannelInitializer<SocketChannel>
     @Override
     public void initChannel(SocketChannel ch) throws Exception {
         ChannelPipeline pipeline = ch.pipeline();
+        pipeline.addLast("encoder", new HttpResponseEncoder());
         pipeline.addLast("decoder", new HttpRequestDecoder());
         pipeline.addLast("aggregator", new HttpObjectAggregator(65536));
-        pipeline.addLast("encoder", new HttpResponseEncoder());
         pipeline.addLast("handler", new AutobahnServerHandler());
     }
 }