From 52d5f79227adf551477de9a085078982d3e5c618 Mon Sep 17 00:00:00 2001
From: li-tiangang4 <litiangang4@huawei.com>
Date: Mon, 25 Nov 2024 14:54:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: li-tiangang4 <litiangang4@huawei.com>
---
 .../src/componentmanager/component_privacy.cpp                | 3 +++
 .../distributedhardwarefwkservice/src/utils/dh_context.cpp    | 3 +++
 services/distributedhardwarefwkservice/src/utils/dh_timer.cpp | 1 -
 utils/src/dh_utils_tool.cpp                                   | 4 ++--
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/services/distributedhardwarefwkservice/src/componentmanager/component_privacy.cpp b/services/distributedhardwarefwkservice/src/componentmanager/component_privacy.cpp
index 2d7c08da..93a0a0a4 100644
--- a/services/distributedhardwarefwkservice/src/componentmanager/component_privacy.cpp
+++ b/services/distributedhardwarefwkservice/src/componentmanager/component_privacy.cpp
@@ -36,6 +36,9 @@ ComponentPrivacy::ComponentPrivacy()
 {
     DHLOGI("ComponentPrivacy ctor.");
     std::shared_ptr<AppExecFwk::EventRunner> runner = AppExecFwk::EventRunner::Create(true);
+    if (runner == nullptr) {
+        DHLOGE("Creat eventrunner failed.");
+    }
     eventHandler_ = std::make_shared<ComponentPrivacy::ComponentEventHandler>(runner, this);
 }
 
diff --git a/services/distributedhardwarefwkservice/src/utils/dh_context.cpp b/services/distributedhardwarefwkservice/src/utils/dh_context.cpp
index b02b2f9b..78a70063 100644
--- a/services/distributedhardwarefwkservice/src/utils/dh_context.cpp
+++ b/services/distributedhardwarefwkservice/src/utils/dh_context.cpp
@@ -33,6 +33,9 @@ DHContext::DHContext()
 {
     DHLOGI("Ctor DHContext");
     std::shared_ptr<AppExecFwk::EventRunner> runner = AppExecFwk::EventRunner::Create(true);
+    if (runner == nullptr) {
+        DHLOGE("Creat eventrunner failed.");
+    }
     eventHandler_ = std::make_shared<DHContext::CommonEventHandler>(runner);
     RegisDHFWKIsomerismListener();
 }
diff --git a/services/distributedhardwarefwkservice/src/utils/dh_timer.cpp b/services/distributedhardwarefwkservice/src/utils/dh_timer.cpp
index 2a9d74d4..9aaf4396 100644
--- a/services/distributedhardwarefwkservice/src/utils/dh_timer.cpp
+++ b/services/distributedhardwarefwkservice/src/utils/dh_timer.cpp
@@ -76,7 +76,6 @@ void DHTimer::StartEventRunner()
     auto busRunner = AppExecFwk::EventRunner::Create(false);
     if (busRunner == nullptr) {
         DHLOGE("busRunner is nullptr!");
-        return;
     }
     {
         std::lock_guard<std::mutex> lock(timerMutex_);
diff --git a/utils/src/dh_utils_tool.cpp b/utils/src/dh_utils_tool.cpp
index 3a202181..69179d57 100644
--- a/utils/src/dh_utils_tool.cpp
+++ b/utils/src/dh_utils_tool.cpp
@@ -59,8 +59,8 @@ int64_t GetCurrentTime()
 
 std::string GetRandomID()
 {
-    static std::random_device rd;
-    static std::uniform_int_distribution<uint64_t> dist(0ULL, 0xFFFFFFFFFFFFFFFFULL);
+    std::random_device rd;
+    std::uniform_int_distribution<uint64_t> dist(0ULL, 0xFFFFFFFFFFFFFFFFULL);
     uint64_t ab = dist(rd);
     uint64_t cd = dist(rd);
     uint32_t a;
-- 
Gitee