From 6c61c9ca7d7731f575b9834fbec991632a5be793 Mon Sep 17 00:00:00 2001
From: zuojiangjiang <zuojiangjiang@huawei.com>
Date: Tue, 11 Jan 2022 13:01:21 +0800
Subject: [PATCH] modify the constructor of KvStoreMetaManager Signed-off-by:
 zuojiangjiang <zuojiangjiang@huawei.com>

---
 .../app/src/kvstore_meta_manager.cpp                 | 12 +++++++++++-
 .../app/src/kvstore_meta_manager.h                   |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/services/distributeddataservice/app/src/kvstore_meta_manager.cpp b/services/distributeddataservice/app/src/kvstore_meta_manager.cpp
index f72618957..9ffd34af4 100755
--- a/services/distributeddataservice/app/src/kvstore_meta_manager.cpp
+++ b/services/distributeddataservice/app/src/kvstore_meta_manager.cpp
@@ -48,7 +48,17 @@ std::mutex KvStoreMetaManager::cvMutex_;
 KvStoreMetaManager::MetaDeviceChangeListenerImpl KvStoreMetaManager::listener_;
 
 KvStoreMetaManager::KvStoreMetaManager()
-    : metaDBDirectory_(Constant::Concatenate({
+    : metaDelegate_(nullptr,
+            [this](DistributedDB::KvStoreNbDelegate *delegate) {
+                if (delegate == nullptr) {
+                    return;
+                }
+                auto result = kvStoreDelegateManager_.CloseKvStore(delegate);
+                if (result != DistributedDB::DBStatus::OK) {
+                    ZLOGE("CloseMetaKvstore return error status: %d", static_cast<int>(result));
+                }
+            }),
+      metaDBDirectory_(Constant::Concatenate({
       Constant::ROOT_PATH_DE, "/", Constant::SERVICE_NAME, "/", Constant::META_DIR_NAME })),
       kvStoreDelegateManager_(META_DB_APP_ID, Constant::GetDefaultHarmonyAccountName())
 {
diff --git a/services/distributeddataservice/app/src/kvstore_meta_manager.h b/services/distributeddataservice/app/src/kvstore_meta_manager.h
index 58bf8178a..f4542a36c 100755
--- a/services/distributeddataservice/app/src/kvstore_meta_manager.h
+++ b/services/distributeddataservice/app/src/kvstore_meta_manager.h
@@ -299,7 +299,7 @@ private:
     static constexpr int KEY_SIZE = 32;
     static constexpr int HOURS_PER_YEAR = (24 * 365);
 
-    NbDelegate metaDelegate_ {};
+    NbDelegate metaDelegate_;
     std::string metaDBDirectory_;
     DistributedDB::KvStoreDelegateManager kvStoreDelegateManager_;
     std::vector<uint8_t> vecRootKeyAlias_ {};
-- 
Gitee