Merge pull request #1997, clienthandler in netty4 should trigger hear…

…tbeat handler. Fixes #1996 . * Remove unuseful 'disconnect()' method since netty4 * trigger heartbeat
apache · Jun 29, 2018 · c271039 · c271039
1 parent 14ff830
commit c271039
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 16 deletions.
diff --git a/...g-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyClientHandler.java b/...g-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyClientHandler.java
@@ -47,17 +47,16 @@ public NettyClientHandler(URL url, ChannelHandler handler) {
 
     @Override
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
-        ctx.fireChannelActive();
+        NettyChannel channel = NettyChannel.getOrAddChannel(ctx.channel(), url, handler);
+        try {
+            handler.connected(channel);
+        } finally {
+            NettyChannel.removeChannelIfDisconnected(ctx.channel());
+        }
     }
 
     @Override
     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-        ctx.fireChannelInactive();
-    }
-
-    @Override
-    public void disconnect(ChannelHandlerContext ctx, ChannelPromise future)
-            throws Exception {
         NettyChannel channel = NettyChannel.getOrAddChannel(ctx.channel(), url, handler);
         try {
             handler.disconnected(channel);

diff --git a/...g-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyServerHandler.java b/...g-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyServerHandler.java
@@ -58,8 +58,6 @@ public Map<String, Channel> getChannels() {
 
     @Override
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
-        ctx.fireChannelActive();
-
         NettyChannel channel = NettyChannel.getOrAddChannel(ctx.channel(), url, handler);
         try {
             if (channel != null) {
@@ -82,13 +80,6 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
         }
     }
 
-
-    @Override
-    public void disconnect(ChannelHandlerContext ctx, ChannelPromise future)
-            throws Exception {
-
-    }
-
     @Override
     public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception {
         NettyChannel channel = NettyChannel.getOrAddChannel(ctx.channel(), url, handler);