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 instance_; sptr dataObsManger_; ConcurrentMap, std::list> 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::instance_ = nullptr; std::mutex DataObsMgrClient::mutex_; class DataObsMgrClient::SystemAbilityStatusChangeListener @@ -52,13 +51,8 @@ void DataObsMgrClient::SystemAbilityStatusChangeListener::OnAddSystemAbility( std::shared_ptr DataObsMgrClient::GetInstance() { - if (instance_ == nullptr) { - std::lock_guard lock_l(mutex_); - if (instance_ == nullptr) { - instance_ = std::make_shared(); - } - } - return instance_; + static std::shared_ptr proxy = std::make_shared(); + return proxy; } DataObsMgrClient::DataObsMgrClient()