From 7159648e57ca29f554f202990e33efaa98ca6d47 Mon Sep 17 00:00:00 2001
From: wangjiaqiang <wangjiaqiang11@huawei.com>
Date: Sun, 1 Sep 2024 17:28:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=AB=E6=8F=8F=E5=8D=95?=
 =?UTF-8?q?=E4=BE=8B=E5=91=8A=E8=AD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: wangjiaqiang <wangjiaqiang11@huawei.com>
---
 .../dataobs_manager/include/dataobs_mgr_client.h       |  1 -
 services/dataobsmgr/src/dataobs_mgr_client.cpp         | 10 ++--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/interfaces/inner_api/dataobs_manager/include/dataobs_mgr_client.h b/interfaces/inner_api/dataobs_manager/include/dataobs_mgr_client.h
index d6789dee21..24b7ec0ea6 100644
--- a/interfaces/inner_api/dataobs_manager/include/dataobs_mgr_client.h
+++ b/interfaces/inner_api/dataobs_manager/include/dataobs_mgr_client.h
@@ -135,7 +135,6 @@ private:
 
     static constexpr int RESUB_INTERVAL = 2;
     static std::mutex mutex_;
-    static std::shared_ptr<DataObsMgrClient> instance_;
     sptr<IDataObsMgr> dataObsManger_;
     ConcurrentMap<sptr<IDataAbilityObserver>, std::list<Uri>> observers_;
 
diff --git a/services/dataobsmgr/src/dataobs_mgr_client.cpp b/services/dataobsmgr/src/dataobs_mgr_client.cpp
index 6fbf4d8f6f..cf6f5c76e0 100644
--- a/services/dataobsmgr/src/dataobs_mgr_client.cpp
+++ b/services/dataobsmgr/src/dataobs_mgr_client.cpp
@@ -24,7 +24,6 @@
 
 namespace OHOS {
 namespace AAFwk {
-std::shared_ptr<DataObsMgrClient> DataObsMgrClient::instance_ = nullptr;
 std::mutex DataObsMgrClient::mutex_;
 
 class DataObsMgrClient::SystemAbilityStatusChangeListener
@@ -52,13 +51,8 @@ void DataObsMgrClient::SystemAbilityStatusChangeListener::OnAddSystemAbility(
 
 std::shared_ptr<DataObsMgrClient> DataObsMgrClient::GetInstance()
 {
-    if (instance_ == nullptr) {
-        std::lock_guard<std::mutex> lock_l(mutex_);
-        if (instance_ == nullptr) {
-            instance_ = std::make_shared<DataObsMgrClient>();
-        }
-    }
-    return instance_;
+    static std::shared_ptr<DataObsMgrClient> proxy = std::make_shared<DataObsMgrClient>();
+    return proxy;
 }
 
 DataObsMgrClient::DataObsMgrClient()