diff --git a/native_engine/impl/ark/ark_native_engine_impl.cpp b/native_engine/impl/ark/ark_native_engine_impl.cpp index 39c5d93946d68c6e22093a7f61851f091069f186..86b006dde8e79be488f6961693dcfd04084a9d5a 100644 --- a/native_engine/impl/ark/ark_native_engine_impl.cpp +++ b/native_engine/impl/ark/ark_native_engine_impl.cpp @@ -163,17 +163,10 @@ ArkNativeEngineImpl::ArkNativeEngineImpl( engineImpl->loadedModules_[module] = Global(ecmaVm, exports); } } else if (module->registerCallback != nullptr) { - NativeScopeManager* scopeManager = nativeEngine->GetScopeManager(); - if (scopeManager == nullptr) { - HILOG_ERROR("scope manager is null"); - return scope.Escape(exports); - } - NativeScope* nativeScope = scopeManager->Open(); NativeValue* exportObject = nativeEngine->CreateObject(); auto arkNativeEngine = static_cast(engineImpl->GetRootNativeEngine()); if (!arkNativeEngine) { HILOG_ERROR("init module failed"); - scopeManager->Close(nativeScope); return scope.Escape(exports); } #ifdef ENABLE_HITRACE @@ -188,7 +181,6 @@ ArkNativeEngineImpl::ArkNativeEngineImpl( Global globalExports = *exportObject; exports = globalExports.ToLocal(ecmaVm); engineImpl->loadedModules_[module] = Global(ecmaVm, exports); - scopeManager->Close(nativeScope); } else { HILOG_ERROR("init module failed"); return scope.Escape(exports); @@ -219,18 +211,12 @@ ArkNativeEngineImpl::ArkNativeEngineImpl( ArkNativeEngine* nativeEngine = new ArkNativeEngine(engineImpl, engineImpl->GetJsEngine(), false); std::string strModuleName = moduleName->ToString(); moduleManager->SetNativeEngine(strModuleName, nativeEngine); - NativeScopeManager* scopeManager = nativeEngine->GetScopeManager(); - if (scopeManager == nullptr) { - HILOG_ERROR("scope manager is null"); - return scope.Escape(exports); - } - NativeScope* nativeScope = scopeManager->Open(); + NativeValue* exportObject = nativeEngine->CreateObject(); if (exportObject != nullptr) { auto arkNativeEngine = static_cast(engineImpl->GetRootNativeEngine()); if (!arkNativeEngine) { HILOG_ERROR("exportObject is nullptr"); - scopeManager->Close(nativeScope); return scope.Escape(exports); } ArkNativeObject* exportObj = reinterpret_cast(exportObject); @@ -239,10 +225,8 @@ ArkNativeEngineImpl::ArkNativeEngineImpl( Global globalExports = *exportObject; exports = globalExports.ToLocal(ecmaVm); engineImpl->loadedModules_[module] = Global(ecmaVm, exports); - scopeManager->Close(nativeScope); } else { HILOG_ERROR("exportObject is nullptr"); - scopeManager->Close(nativeScope); return scope.Escape(exports); } }