From a326bc3df78f00a1d4368d0f74a0616bb4cc9bff Mon Sep 17 00:00:00 2001 From: oh_ci Date: Fri, 1 Aug 2025 10:06:36 +0000 Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=20'Pull=20Request=20!69277?= =?UTF-8?q?=20:=20=E5=91=8A=E8=AD=A6=E6=B8=85=E7=90=86'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entrance/dynamic_component/eaworker_task_wrapper_impl.cpp | 3 ++- frameworks/bridge/arkts_frontend/entry/arkts_entry_loader.cpp | 2 +- .../ets/ani/pluginComponent/src/ani_plugin_component.cpp | 3 --- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/adapter/ohos/entrance/dynamic_component/eaworker_task_wrapper_impl.cpp b/adapter/ohos/entrance/dynamic_component/eaworker_task_wrapper_impl.cpp index e812c570571..16902578220 100644 --- a/adapter/ohos/entrance/dynamic_component/eaworker_task_wrapper_impl.cpp +++ b/adapter/ohos/entrance/dynamic_component/eaworker_task_wrapper_impl.cpp @@ -185,7 +185,8 @@ void EaWorkerTaskWrapperImpl::DumpWorker() } auto worker_id = arkts::concurrency_helpers::GetWorkerId(envCurr); - TAG_LOGI(AceLogTag::ACE_DYNAMIC_COMPONENT, "DumpWorker end, worker_id: %{public}d", worker_id); + TAG_LOGI(AceLogTag::ACE_DYNAMIC_COMPONENT, "DumpWorker end, worker_id: %{public}d, vmInThread: %{public}p", + worker_id, vmInThread); } void EaWorkerTaskWrapperImpl::Call(const TaskExecutor::Task& task, uint32_t delayTime) diff --git a/frameworks/bridge/arkts_frontend/entry/arkts_entry_loader.cpp b/frameworks/bridge/arkts_frontend/entry/arkts_entry_loader.cpp index dff47b13d1c..0c6f0825994 100644 --- a/frameworks/bridge/arkts_frontend/entry/arkts_entry_loader.cpp +++ b/frameworks/bridge/arkts_frontend/entry/arkts_entry_loader.cpp @@ -96,7 +96,7 @@ EntryLoader::EntryLoader(ani_env* env, const std::string& abcModulePath): env_(e ANI_CALL(env, GetUndefined(&undefined), return); ani_string abcModulePathStr; - ANI_CALL(env, String_NewUTF8(abcModulePath.c_str(), abcModulePath.length(), &abcModulePathStr), return); + env->String_NewUTF8(abcModulePath.c_str(), abcModulePath.length(), &abcModulePathStr); ani_type stringCls; ANI_CALL(env, Object_GetType(abcModulePathStr, &stringCls), return); diff --git a/interfaces/ets/ani/pluginComponent/src/ani_plugin_component.cpp b/interfaces/ets/ani/pluginComponent/src/ani_plugin_component.cpp index 65fe06595e7..48b6d872e56 100644 --- a/interfaces/ets/ani/pluginComponent/src/ani_plugin_component.cpp +++ b/interfaces/ets/ani/pluginComponent/src/ani_plugin_component.cpp @@ -152,13 +152,11 @@ static void Request([[maybe_unused]] ani_env* env, [[maybe_unused]] ani_object r bool ret = ParsePushAndRequestParameters(env, asyncCallbackInfo, requestParameters); if (!ret) { LOGE("plugin-ani parse request params fail"); - AceFreeAsyncJSCallbackInfo(&asyncCallbackInfo); return; } ani_ref fnObjGlobalRef = nullptr; if (ANI_OK != env->GlobalReference_Create(reinterpret_cast(fnObj), &fnObjGlobalRef)) { LOGE("plugin-ani get request call back failed"); - AceFreeAsyncJSCallbackInfo(&asyncCallbackInfo); return; } asyncCallbackInfo->cbInfo.callback = fnObjGlobalRef; @@ -178,7 +176,6 @@ static void On([[maybe_unused]] ani_env* env, [[maybe_unused]] ani_string eventT ani_ref fnObjGlobalRef = nullptr; if (ANI_OK != env->GlobalReference_Create(reinterpret_cast(fnObj), &fnObjGlobalRef)) { LOGE("plugin-ani get %{public}s call back failed", eventType.c_str()); - AceFreeAsyncJSCallbackInfo(&asyncCallbackInfo); return; } asyncCallbackInfo->cbInfo.callback = fnObjGlobalRef; -- Gitee