From 0f43ab1b54a93bf96872284e0aec9257b5055df8 Mon Sep 17 00:00:00 2001 From: li-tiangang4 Date: Mon, 16 Dec 2024 15:14:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=E8=AE=BE=E5=A4=87=E4=B8=8B?= =?UTF-8?q?=E7=BA=BF=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 --- .../src/task/disable_task.cpp | 7 +++---- .../src/task/meta_disable_task.cpp | 8 +++----- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/services/distributedhardwarefwkservice/src/task/disable_task.cpp b/services/distributedhardwarefwkservice/src/task/disable_task.cpp index d87664d5..483ad696 100644 --- a/services/distributedhardwarefwkservice/src/task/disable_task.cpp +++ b/services/distributedhardwarefwkservice/src/task/disable_task.cpp @@ -73,15 +73,14 @@ void DisableTask::DoTaskInner() auto state = (result == DH_FWK_SUCCESS) ? TaskState::SUCCESS : TaskState::FAIL; SetTaskState(state); - DHLOGD("finish disable task, remove it, id = %{public}s", GetId().c_str()); - std::string taskId = GetId(); - TaskBoard::GetInstance().RemoveTask(taskId); /* if finish task, notify father finish */ std::shared_ptr father = GetFatherTask().lock(); if (father != nullptr) { auto offLineTask = std::static_pointer_cast(father); - offLineTask->NotifyFatherFinish(taskId); + offLineTask->NotifyFatherFinish(GetId()); } + DHLOGD("finish disable task, remove it, id = %{public}s", GetId().c_str()); + TaskBoard::GetInstance().RemoveTask(GetId()); } int32_t DisableTask::UnRegisterHardware() diff --git a/services/distributedhardwarefwkservice/src/task/meta_disable_task.cpp b/services/distributedhardwarefwkservice/src/task/meta_disable_task.cpp index 28bf917a..95d7c218 100644 --- a/services/distributedhardwarefwkservice/src/task/meta_disable_task.cpp +++ b/services/distributedhardwarefwkservice/src/task/meta_disable_task.cpp @@ -64,16 +64,14 @@ void MetaDisableTask::DoTaskInner() auto result = Disable(); auto state = (result == DH_FWK_SUCCESS) ? TaskState::SUCCESS : TaskState::FAIL; SetTaskState(state); - - DHLOGD("finish meta disable task, remove it, id = %{public}s", GetId().c_str()); - std::string taskId = GetId(); - TaskBoard::GetInstance().RemoveTask(taskId); /* if finish task, notify father finish */ std::shared_ptr father = GetFatherTask().lock(); if (father != nullptr) { auto offLineTask = std::static_pointer_cast(father); - offLineTask->NotifyFatherFinish(taskId); + offLineTask->NotifyFatherFinish(GetId()); } + DHLOGD("finish meta disable task, remove it, id = %{public}s", GetId().c_str()); + TaskBoard::GetInstance().RemoveTask(GetId()); } int32_t MetaDisableTask::Disable() -- Gitee