diff --git a/interfaces/kits/js/backup/session_backup_n_exporter.cpp b/interfaces/kits/js/backup/session_backup_n_exporter.cpp index cc43ea2286004047c1ff697a279bf886d658d0e5..713527c7fa679df7dc11f9224d37e6bbd5a28ac6 100644 --- a/interfaces/kits/js/backup/session_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_backup_n_exporter.cpp @@ -85,8 +85,12 @@ static void onBundleBegin(weak_ptr pCallbacks, ErrCode err, co } auto cbCompl = [name {name}, errCode {err}](napi_env env, NError err) -> NVal { - NVal res; NVal bundleName = NVal::CreateUTF8String(env, name); + if (!err && errCode == 0) { + return bundleName; + } + + NVal res; if (err) { res = NVal {env, err.GetNapiErr(env)}; } else { @@ -120,8 +124,12 @@ static void onBundleEnd(weak_ptr pCallbacks, ErrCode err, cons } auto cbCompl = [name {name}, errCode {err}](napi_env env, NError err) -> NVal { - NVal res; NVal bundleName = NVal::CreateUTF8String(env, name); + if (!err && errCode == 0) { + return bundleName; + } + + NVal res; if (err) { res = NVal {env, err.GetNapiErr(env)}; } else { @@ -155,6 +163,10 @@ static void onAllBundlesEnd(weak_ptr pCallbacks, ErrCode err) } auto cbCompl = [errCode {err}](napi_env env, NError err) -> NVal { + if (!err && errCode == 0) { + return NVal::CreateUndefined(env); + } + NVal res; if (err) { res = NVal {env, err.GetNapiErr(env)}; diff --git a/interfaces/kits/js/backup/session_restore_n_exporter.cpp b/interfaces/kits/js/backup/session_restore_n_exporter.cpp index ab06dce5b85b50ce936525805a99cdfc921bc664..53d9c0df0e658b8f49ab09b5680a3bbf161c7762 100644 --- a/interfaces/kits/js/backup/session_restore_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_restore_n_exporter.cpp @@ -85,8 +85,12 @@ static void onBundleBegin(weak_ptr pCallbacks, ErrCode err, co } auto cbCompl = [name {name}, errCode {err}](napi_env env, NError err) -> NVal { - NVal res; NVal bundleName = NVal::CreateUTF8String(env, name); + if (!err && errCode == 0) { + return bundleName; + } + + NVal res; if (err) { res = NVal {env, err.GetNapiErr(env)}; } else { @@ -120,8 +124,12 @@ static void onBundleEnd(weak_ptr pCallbacks, ErrCode err, cons } auto cbCompl = [name {name}, errCode {err}](napi_env env, NError err) -> NVal { - NVal res; NVal bundleName = NVal::CreateUTF8String(env, name); + if (!err && errCode == 0) { + return bundleName; + } + + NVal res; if (err) { res = NVal {env, err.GetNapiErr(env)}; } else { @@ -155,6 +163,10 @@ static void onAllBundlesEnd(weak_ptr pCallbacks, ErrCode err) } auto cbCompl = [errCode {err}](napi_env env, NError err) -> NVal { + if (!err && errCode == 0) { + return NVal::CreateUndefined(env); + } + NVal res; if (err) { res = NVal {env, err.GetNapiErr(env)};