From bea5929db5d011503ab6e2ccc69a1b6be5d42e99 Mon Sep 17 00:00:00 2001
From: chaychen <chaychen@zhangruideMacBook-Air.local>
Date: Tue, 22 Sep 2020 17:49:54 +0800
Subject: [PATCH] fix channel bug

---
 .../java/org/fisco/bcos/sdk/eventsub/SubscribeTest.java     | 2 +-
 .../java/org/fisco/bcos/sdk/channel/ChannelMsgHandler.java  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/integration-test/java/org/fisco/bcos/sdk/eventsub/SubscribeTest.java b/src/integration-test/java/org/fisco/bcos/sdk/eventsub/SubscribeTest.java
index d52c8f8ca..050c97852 100644
--- a/src/integration-test/java/org/fisco/bcos/sdk/eventsub/SubscribeTest.java
+++ b/src/integration-test/java/org/fisco/bcos/sdk/eventsub/SubscribeTest.java
@@ -138,13 +138,13 @@ public void onReceiveLog(int status, List<EventLog> logs) {
             Thread.currentThread().interrupt();
         }
 
-        // FISCO BCOS node v2.7.0
         try{
             Thread.sleep(3000);
         } catch (Exception e) {
             logger.error("exception:", e);
         }
 
+        // FISCO BCOS node v2.7.0
         /*logger.info(" start to unregister event");
         SubscribeCallback subscribeEventCallback2 = new SubscribeCallback();
         eventSubscribe.unsubscribeEvent(registerId1, subscribeEventCallback2);
diff --git a/src/main/java/org/fisco/bcos/sdk/channel/ChannelMsgHandler.java b/src/main/java/org/fisco/bcos/sdk/channel/ChannelMsgHandler.java
index 1f2a93e24..8b9e24f81 100644
--- a/src/main/java/org/fisco/bcos/sdk/channel/ChannelMsgHandler.java
+++ b/src/main/java/org/fisco/bcos/sdk/channel/ChannelMsgHandler.java
@@ -246,6 +246,9 @@ public void onResponse(Response response) {
                         if (disconnect) {
                             ctx.disconnect();
                             ctx.close();
+                        } else {
+                            String host = ChannelVersionNegotiation.getPeerHost(ctx);
+                            addAvailablePeer(host, ctx);
                         }
                     }
                 };
@@ -324,9 +327,6 @@ public void onResponse(Response response) {
                         if (disconnect) {
                             ctx.disconnect();
                             ctx.close();
-                        } else {
-                            String host = ChannelVersionNegotiation.getPeerHost(ctx);
-                            addAvailablePeer(host, ctx);
                         }
                     }
                 };