From ed12a8b0be34739e5ca561541ca5e7b207effeae Mon Sep 17 00:00:00 2001
From: chaychen <chaychen@zhangruideMacBook-Air.local>
Date: Sun, 27 Sep 2020 14:48:37 +0800
Subject: [PATCH] stop event in bcosSDK

---
 .../src/main/java/org/fisco/bcos/sdk/BcosSDK.java        | 4 ++++
 .../org/fisco/bcos/sdk/eventsub/EventSubscribeImp.java   | 9 ++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/sdk-service/src/main/java/org/fisco/bcos/sdk/BcosSDK.java b/sdk-service/src/main/java/org/fisco/bcos/sdk/BcosSDK.java
index d70e8068b..277e799c2 100644
--- a/sdk-service/src/main/java/org/fisco/bcos/sdk/BcosSDK.java
+++ b/sdk-service/src/main/java/org/fisco/bcos/sdk/BcosSDK.java
@@ -204,6 +204,10 @@ public void stopAll() {
         // stop the client
         for (Integer groupId : groupToClient.keySet()) {
             groupToClient.get(groupId).stop();
+            EventSubscribe event = this.getEventSubscribe(groupId);
+            if (event != null) {
+                event.stop();
+            }
         }
     }
 }
diff --git a/sdk-service/src/main/java/org/fisco/bcos/sdk/eventsub/EventSubscribeImp.java b/sdk-service/src/main/java/org/fisco/bcos/sdk/eventsub/EventSubscribeImp.java
index 7eb29239f..00f2b635c 100644
--- a/sdk-service/src/main/java/org/fisco/bcos/sdk/eventsub/EventSubscribeImp.java
+++ b/sdk-service/src/main/java/org/fisco/bcos/sdk/eventsub/EventSubscribeImp.java
@@ -142,10 +142,13 @@ public void start() {
 
     @Override
     public void stop() {
+        if (!running) {
+            return;
+        }
         running = false;
         resendSchedule.shutdown();
-        // unsubscribe events
-        List<EventLogFilter> filterList = getAllSubscribedEvent();
+        // unsubscribe events, fisco bcos 2.7.0
+        /*List<EventLogFilter> filterList = getAllSubscribedEvent();
         for (EventLogFilter filter : filterList) {
             EventCallback callback =
                     new EventCallback() {
@@ -158,7 +161,7 @@ public void onReceiveLog(int status, List<EventLog> logs) {
                         }
                     };
             unsubscribeEvent(filter.getRegisterID(), callback);
-        }
+        }*/
     }
 
     private void resendWaitingFilters() {