From 34106612ae39b78fe5a46fcd7c3e84c651602ed2 Mon Sep 17 00:00:00 2001 From: liweifeng Date: Thu, 30 Mar 2023 09:31:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8arkts?= =?UTF-8?q?=E5=8D=A1=E7=89=87=EF=BC=8C=E5=8D=A1=E7=89=87=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E8=BF=98=E5=8E=9F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: liweifeng Change-Id: Ibb293b046ec15e4b8adabc9449f1d3814e9281f3 --- .../src/form_render_record.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/services/form_render_service/src/form_render_record.cpp b/services/form_render_service/src/form_render_record.cpp index accd307e56..f515da231b 100644 --- a/services/form_render_service/src/form_render_record.cpp +++ b/services/form_render_service/src/form_render_record.cpp @@ -316,7 +316,6 @@ void FormRenderRecord::HandleUpdateInJsThread(const FormJsInfo &formJsInfo, cons bool FormRenderRecord::HandleDeleteInJsThread(int64_t formId, const std::string &compId) { HILOG_INFO("Delete some resources in js thread."); - bool isGroupEmpty = false; { std::lock_guard lock(formRendererGroupMutex_); auto search = formRendererGroupMap_.find(formId); @@ -330,17 +329,15 @@ bool FormRenderRecord::HandleDeleteInJsThread(int64_t formId, const std::string } if (!compId.empty()) { search->second->DeleteForm(compId); + HILOG_INFO("HandleDeleteInJsThread compid is %{public}s", compId.c_str()); + return false; } - isGroupEmpty = search->second->IsEmpty(); - if (isGroupEmpty) { - formRendererGroupMap_.erase(formId); - } - } - if (isGroupEmpty) { - std::lock_guard lock(hostsMapMutex_); - hostsMapForFormId_.erase(formId); + search->second->DeleteForm(); + formRendererGroupMap_.erase(formId); } - return isGroupEmpty; + std::lock_guard lock(hostsMapMutex_); + hostsMapForFormId_.erase(formId); + return true; } void FormRenderRecord::HandleDestroyInJsThread() -- Gitee