From 1bdfef8f1b897da2f15a63c36e5f123fab850e50 Mon Sep 17 00:00:00 2001
From: zuojiangjiang <zuojiangjiang@huawei.com>
Date: Sat, 27 May 2023 15:25:30 +0800
Subject: [PATCH] update Signed-off-by: zuojiangjiang
 <zuojiangjiang@huawei.com>

---
 .../service/rdb/rdb_general_store.cpp                     | 8 ++++++--
 .../service/rdb/rdb_general_store.h                       | 2 ++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/datamgr_service/services/distributeddataservice/service/rdb/rdb_general_store.cpp b/datamgr_service/services/distributeddataservice/service/rdb/rdb_general_store.cpp
index 277cbdf9..696e0dd4 100644
--- a/datamgr_service/services/distributeddataservice/service/rdb/rdb_general_store.cpp
+++ b/datamgr_service/services/distributeddataservice/service/rdb/rdb_general_store.cpp
@@ -22,7 +22,6 @@
 #include "log_print.h"
 #include "metadata/meta_data_manager.h"
 #include "metadata/secret_key_meta_data.h"
-#include "rdb_cloud.h"
 #include "rdb_cursor.h"
 #include "rdb_helper.h"
 #include "rdb_query.h"
@@ -94,7 +93,12 @@ int32_t RdbGeneralStore::Bind(const Database &database, BindInfo bindInfo)
         ZLOGE("cloudDb is null");
         return GeneralError::E_ERROR;
     }
-    delegate_->SetCloudDB(std::make_shared<RdbCloud>(bindInfo.db_));
+    rdbCloud_ = std::make_shared<RdbCloud>(bindInfo_.db_);
+    if (rdbCloud_ == nullptr) {
+        ZLOGE("rdb_cloudDb is null");
+        return GeneralError::E_ERROR;
+    }
+    delegate_->SetCloudDB(rdbCloud_);
     DBSchema schema;
     schema.tables.resize(database.tables.size());
     for (size_t i = 0; i < database.tables.size(); i++) {
diff --git a/datamgr_service/services/distributeddataservice/service/rdb/rdb_general_store.h b/datamgr_service/services/distributeddataservice/service/rdb/rdb_general_store.h
index f337fe56..452e7fd5 100644
--- a/datamgr_service/services/distributeddataservice/service/rdb/rdb_general_store.h
+++ b/datamgr_service/services/distributeddataservice/service/rdb/rdb_general_store.h
@@ -19,6 +19,7 @@
 #include "relational_store_delegate.h"
 #include "relational_store_manager.h"
 
+#include "rdb_cloud.h"
 #include "rdb_store.h"
 #include "store/general_store.h"
 #include "metadata/store_meta_data.h"
@@ -58,6 +59,7 @@ private:
     RdbManager manager_;
     RdbDelegate *delegate_ = nullptr;
     std::shared_ptr<RdbStore> store_;
+    std::shared_ptr<RdbCloud> rdbCloud_ {};
     BindInfo bindInfo_;
 };
 } // namespace OHOS::DistributedRdb
-- 
Gitee