Remove calling of keepAliveHandler.destroy() as possible

line · Aug 1, 2024 · 91e814b · 91e814b
1 parent d10019d
commit 91e814b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 35 deletions.
diff --git a/core/src/main/java/com/linecorp/armeria/client/Http1ResponseDecoder.java b/core/src/main/java/com/linecorp/armeria/client/Http1ResponseDecoder.java
@@ -118,9 +118,7 @@ private void onWrapperCompleted(HttpResponseWrapper resWrapper, @Nullable Throwa
     public void handlerAdded(ChannelHandlerContext ctx) throws Exception {}
 
     @Override
-    public void handlerRemoved(ChannelHandlerContext ctx) throws Exception {
-        keepAliveHandler.destroy();
-    }
+    public void handlerRemoved(ChannelHandlerContext ctx) throws Exception {}
 
     @Override
     public void channelRegistered(ChannelHandlerContext ctx) throws Exception {

diff --git a/core/src/main/java/com/linecorp/armeria/client/Http2ClientConnectionHandler.java b/core/src/main/java/com/linecorp/armeria/client/Http2ClientConnectionHandler.java
@@ -72,22 +72,6 @@ Http2ResponseDecoder responseDecoder() {
         return responseDecoder;
     }
 
-    @Override
-    public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
-        super.handlerAdded(ctx);
-    }
-
-    @Override
-    protected void handlerRemoved0(ChannelHandlerContext ctx) throws Exception {
-        destroyKeepAliveHandler();
-        super.handlerRemoved0(ctx);
-    }
-
-    @Override
-    public void channelRegistered(ChannelHandlerContext ctx) throws Exception {
-        super.channelRegistered(ctx);
-    }
-
     @Override
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
         super.channelActive(ctx);
@@ -100,14 +84,4 @@ protected boolean needsImmediateDisconnection() {
         return responseDecoder.goAwayHandler().receivedErrorGoAway() ||
                keepAliveHandler().isClosing();
     }
-
-    @Override
-    public void channelInactive(final ChannelHandlerContext ctx) throws Exception {
-        destroyKeepAliveHandler();
-        super.channelInactive(ctx);
-    }
-
-    private void destroyKeepAliveHandler() {
-        keepAliveHandler().destroy();
-    }
 }
diff --git a/core/src/main/java/com/linecorp/armeria/server/HttpServerPipelineConfigurator.java b/core/src/main/java/com/linecorp/armeria/server/HttpServerPipelineConfigurator.java
@@ -631,12 +631,6 @@ public void handlerAdded(ChannelHandlerContext ctx) throws Exception {
             name = ctx.name();
         }
 
-        @Override
-        public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-            keepAliveHandler.destroy();
-            super.channelInactive(ctx);
-        }
-
         @Override
         protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
             keepAliveHandler.onReadOrWrite();