issue #4699: org.apache.dubbo.remoting.exchange.support.DefaultFuture…

…#closeChannel doesn't work as expected
apache · Jul 30, 2019 · 4aa12c6 · 4aa12c6
1 parent 5d299af
commit 4aa12c6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/...src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchangeClient.java b/...src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchangeClient.java
@@ -20,13 +20,15 @@
 import org.apache.dubbo.common.timer.HashedWheelTimer;
 import org.apache.dubbo.common.utils.Assert;
 import org.apache.dubbo.common.utils.NamedThreadFactory;
+import org.apache.dubbo.remoting.Channel;
 import org.apache.dubbo.remoting.ChannelHandler;
 import org.apache.dubbo.remoting.Client;
 import org.apache.dubbo.remoting.Constants;
 import org.apache.dubbo.remoting.RemotingException;
 import org.apache.dubbo.remoting.exchange.ExchangeChannel;
 import org.apache.dubbo.remoting.exchange.ExchangeClient;
 import org.apache.dubbo.remoting.exchange.ExchangeHandler;
+import org.apache.dubbo.remoting.transport.AbstractClient;
 
 import java.net.InetSocketAddress;
 import java.util.Collections;
@@ -55,7 +57,7 @@ public class HeaderExchangeClient implements ExchangeClient {
     public HeaderExchangeClient(Client client, boolean startTimer) {
         Assert.notNull(client, "Client can't be null");
         this.client = client;
-        this.channel = new HeaderExchangeChannel(client);
+        this.channel = new HeaderExchangeChannel(unwrapChannel(client));
 
         if (startTimer) {
             URL url = client.getUrl();
@@ -224,4 +226,8 @@ private boolean shouldReconnect(URL url) {
     public String toString() {
         return "HeaderExchangeClient [channel=" + channel + "]";
     }
+
+    private Channel unwrapChannel(Client client) {
+        return (client instanceof AbstractClient) ? ((AbstractClient) client).getChannel() : client;
+    }
 }
diff --git a/.../dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractClient.java b/.../dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractClient.java
@@ -325,5 +325,5 @@ public String toString() {
      *
      * @return channel
      */
-    protected abstract Channel getChannel();
+    public abstract Channel getChannel();
 }
diff --git a/...ting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyClient.java b/...ting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyClient.java
@@ -101,7 +101,7 @@ protected void doClose() throws Throwable {
     }
 
     @Override
-    protected Channel getChannel() {
+    public Channel getChannel() {
         Connection<?> c = connection;
         if (c == null || !c.isOpen()) {
             return null;

diff --git a/...ubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaClient.java b/...ubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaClient.java
@@ -163,7 +163,7 @@ protected void doClose() throws Throwable {
     }
 
     @Override
-    protected Channel getChannel() {
+    public Channel getChannel() {
         IoSession s = session;
         if (s == null || !s.isConnected()) {
             return null;

diff --git a/...o-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyClient.java b/...o-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyClient.java
@@ -155,7 +155,7 @@ protected void doClose() throws Throwable {
     }
 
     @Override
-    protected org.apache.dubbo.remoting.Channel getChannel() {
+    public org.apache.dubbo.remoting.Channel getChannel() {
         Channel c = channel;
         if (c == null || !c.isConnected()) {
             return null;

diff --git a/...remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyClient.java b/...remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyClient.java
@@ -190,7 +190,7 @@ protected void doClose() throws Throwable {
     }
 
     @Override
-    protected org.apache.dubbo.remoting.Channel getChannel() {
+    public org.apache.dubbo.remoting.Channel getChannel() {
         Channel c = channel;
         if (c == null || !c.isActive()) {
             return null;