From d9066cf7aa05fccfe5bf41c0ab88b4e9c9a12ebe Mon Sep 17 00:00:00 2001
From: xdongs <xdongs@163.com>
Date: Mon, 12 Aug 2024 10:24:38 +0800
Subject: [PATCH] =?UTF-8?q?unsubscribe=20=EF=BC=88cherry=20picked=20commit?=
 =?UTF-8?q?=20from=20<gitee.com//openharmony/notification=5Fdistributed=5F?=
 =?UTF-8?q?notification=5Fservice/commit/f671869655b3027743b9f3bfa2fbc1c3c?=
 =?UTF-8?q?b0d7cc7>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frameworks/js/napi/src/subscribe.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/frameworks/js/napi/src/subscribe.cpp b/frameworks/js/napi/src/subscribe.cpp
index ee3b923d2..043c7549a 100644
--- a/frameworks/js/napi/src/subscribe.cpp
+++ b/frameworks/js/napi/src/subscribe.cpp
@@ -509,7 +509,7 @@ void ThreadSafeOnDisconnected(napi_env env, napi_value jsCallback, void* context
     }
 
     Common::SetCallback(dataWorkerData->env, dataWorkerData->ref, Common::NapiGetNull(dataWorkerData->env));
-
+    DelSubscriberInstancesInfo(dataWorkerData->env, dataWorkerData->subscriber);
     delete dataWorkerData;
     dataWorkerData = nullptr;
 }
@@ -541,7 +541,6 @@ void SubscriberInstance::OnDisconnected()
     napi_acquire_threadsafe_function(unsubscribeCallbackInfo_.tsfn);
     napi_call_threadsafe_function(unsubscribeCallbackInfo_.tsfn, dataWorker, napi_tsfn_nonblocking);
     napi_release_threadsafe_function(unsubscribeCallbackInfo_.tsfn, napi_tsfn_abort);
-    DelSubscriberInstancesInfo(dataWorker->env, dataWorker->subscriber);
 }
 
 void ThreadSafeOnDestroy(napi_env env, napi_value jsCallback, void* context, void* data)
-- 
Gitee