Don't mess with the pipeline config

Signed-off-by: Thomas Segismont <tsegismont@gmail.com>

src/main/java/io/vertx/core/http/impl/HttpServerImpl.java

@@ -284,7 +284,6 @@ protected void configurePipeline(ChannelHandlerContext ctx, String protocol) thr
                   pipeline.addLast(new Http1xOrHttp2Handler());
                 }
               }
-              HttpServerImpl.this.onChannelInitialized(ch);
             }
         });
 
@@ -342,7 +341,10 @@ protected void configurePipeline(ChannelHandlerContext ctx, String protocol) thr
   }
 
   // Visible for testing
-  protected void onChannelInitialized(Channel ch) {
+  protected void handleConnectionException(ChannelHandlerContext ctx, Throwable cause) {
+    Channel channel = ctx.channel();
+    log.trace("Connection failure", cause);
+    channel.close();
   }
 
   private VertxHttp2ConnectionHandler<Http2ServerConnection> createHttp2Handler(HandlerHolder<HttpHandler> holder, Channel ch) {
@@ -1062,10 +1064,8 @@ private void http1(ChannelHandlerContext ctx, ByteBuf buf) {
     }
 
     @Override
-    public void exceptionCaught(ChannelHandlerContext chctx, Throwable cause) throws Exception {
-      Channel channel = chctx.channel();
-      log.trace("Connection failure", cause);
-      channel.close();
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
+      HttpServerImpl.this.handleConnectionException(ctx, cause);
     }
   }
 }

src/test/java/io/vertx/test/core/HttpConnectionEarlyResetTest.java

@@ -16,9 +16,7 @@
 
 package io.vertx.test.core;
 
-import io.netty.channel.Channel;
 import io.netty.channel.ChannelHandlerContext;
-import io.netty.channel.SimpleChannelInboundHandler;
 import io.vertx.core.http.HttpServer;
 import io.vertx.core.http.HttpServerOptions;
 import io.vertx.core.http.impl.HttpServerImpl;
@@ -27,9 +25,12 @@
 import io.vertx.core.net.NetSocket;
 import org.junit.Test;
 
+import java.io.IOException;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicReference;
 
+import static org.hamcrest.CoreMatchers.*;
+
 /**
  * Make sure that the Netty pipeline has a handler catching the {@link java.io.IOException} if the connection is reset
  * before any data has been sent.
@@ -48,8 +49,10 @@ public void setUp() throws Exception {
     CountDownLatch listenLatch = new CountDownLatch(1);
     httpServer = new HttpServerImpl((VertxInternal) vertx, new HttpServerOptions()) {
       @Override
-      protected void onChannelInitialized(Channel ch) {
-        ch.pipeline().addFirst(new ResetLatchCountDown()).addLast(new ThrowableRecorder());
+      protected void handleConnectionException(ChannelHandlerContext ctx, Throwable cause) {
+        super.handleConnectionException(ctx, cause);
+        caught.set(cause);
+        resetLatch.countDown();
       }
     }.requestHandler(request -> {}).listen(8080, onSuccess(server -> listenLatch.countDown()));
     awaitLatch(listenLatch);
@@ -59,7 +62,7 @@ protected void onChannelInitialized(Channel ch) {
   public void testExceptionCaught() throws Exception {
     vertx.createNetClient(new NetClientOptions().setSoLinger(0)).connect(8080, "localhost", onSuccess(NetSocket::close));
     awaitLatch(resetLatch);
-    assertNull(caught.get());
+    assertThat(caught.get(), instanceOf(IOException.class));
   }
 
   @Override
@@ -71,38 +74,4 @@ public void tearDown() throws Exception {
     }
     super.tearDown();
   }
-
-  private class ResetLatchCountDown extends SimpleChannelInboundHandler<Object> {
-    @Override
-    protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception {
-    }
-
-    @Override
-    public boolean acceptInboundMessage(Object msg) throws Exception {
-      return false;
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-      super.exceptionCaught(ctx, cause);
-      ctx.executor().submit(resetLatch::countDown);
-    }
-  }
-
-  private class ThrowableRecorder extends SimpleChannelInboundHandler<Object> {
-    @Override
-    protected void channelRead0(ChannelHandlerContext ctx, Object msg) throws Exception {
-    }
-
-    @Override
-    public boolean acceptInboundMessage(Object msg) throws Exception {
-      return false;
-    }
-
-    @Override
-    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-      super.exceptionCaught(ctx, cause);
-      caught.set(cause);
-    }
-  }
 }