diff --git a/interfaces/kits/js/backup/session_backup_n_exporter.cpp b/interfaces/kits/js/backup/session_backup_n_exporter.cpp index f331a15f3f79dd7635e29f0fc65382897aaa168f..c04ef6664b89560dfab6604181d2810a8634f504 100644 --- a/interfaces/kits/js/backup/session_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_backup_n_exporter.cpp @@ -418,19 +418,18 @@ napi_value SessionBackupNExporter::GetLocalCapabilities(napi_env env, napi_callb NError(BError(BError::Codes::SDK_INVAL_ARG, "Failed to get backupSession entity.").GetCode()).ThrowErr(env); return nullptr; } - UniqueFd fd; - auto cbExec = [session {backupEntity->session.get()}, &fd]() -> NError { + auto fd = make_shared(); + auto cbExec = [session {backupEntity->session.get()}, fd]() -> NError { if (!session) { return NError(BError(BError::Codes::SDK_INVAL_ARG, "backup session is nullptr").GetCode()); } - fd = session->GetLocalCapabilities(); - return fd < 0 ? NError(BError(BError::Codes::SA_INVAL_ARG, "Failed to get local capabilities.").GetCode()) : - NError(BError(BError::Codes::OK, "Success to get local capabilities.").GetCode()); + *fd = session->GetLocalCapabilities(); + return NError(ERRNO_NOERR); }; - auto cbCompl = [&fd](napi_env env, NError err) -> NVal { + auto cbCompl = [fd](napi_env env, NError err) -> NVal { NVal obj = NVal::CreateObject(env); - obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd.Release()).val_)}); - return err ? NVal {env, err.GetNapiErr(env)} : obj; + obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd->Release()).val_)}); + return {obj}; }; NVal thisVar(env, funcArg.GetThisVar()); return NAsyncWorkPromise(env, thisVar).Schedule(className, cbExec, cbCompl).val_; diff --git a/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp b/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp index 5d61b6db4667ac341662a5465dc2782c63a779b8..05912440e21fbcaa731e510b3b52876f3771fbda 100644 --- a/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_incremental_backup_n_exporter.cpp @@ -421,19 +421,18 @@ napi_value SessionIncrementalBackupNExporter::GetLocalCapabilities(napi_env env, NError(BError(BError::Codes::SDK_INVAL_ARG, "Failed to get backupSession entity.").GetCode()).ThrowErr(env); return nullptr; } - UniqueFd fd; - auto cbExec = [session {backupEntity->session.get()}, &fd]() -> NError { + auto fd = make_shared(); + auto cbExec = [session {backupEntity->session.get()}, fd]() -> NError { if (!session) { return NError(BError(BError::Codes::SDK_INVAL_ARG, "backup session is nullptr").GetCode()); } - fd = session->GetLocalCapabilities(); - return fd < 0 ? NError(BError(BError::Codes::SA_INVAL_ARG, "Failed to get local capabilities.").GetCode()) : - NError(BError(BError::Codes::OK, "Success to get local capabilities.").GetCode()); + *fd = session->GetLocalCapabilities(); + return NError(ERRNO_NOERR); }; - auto cbCompl = [&fd](napi_env env, NError err) -> NVal { + auto cbCompl = [fd](napi_env env, NError err) -> NVal { NVal obj = NVal::CreateObject(env); - obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd.Release()).val_)}); - return err ? NVal {env, err.GetNapiErr(env)} : obj; + obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd->Release()).val_)}); + return {obj}; }; NVal thisVar(env, funcArg.GetThisVar()); return NAsyncWorkPromise(env, thisVar).Schedule(className, cbExec, cbCompl).val_; diff --git a/interfaces/kits/js/backup/session_restore_n_exporter.cpp b/interfaces/kits/js/backup/session_restore_n_exporter.cpp index bb507b410306e61cad507e465a2690f87d7b2e97..ef6ddf6df0e597aaaec74df1e61ffcd9fd0b2dfc 100644 --- a/interfaces/kits/js/backup/session_restore_n_exporter.cpp +++ b/interfaces/kits/js/backup/session_restore_n_exporter.cpp @@ -508,23 +508,22 @@ napi_value SessionRestoreNExporter::GetLocalCapabilities(napi_env env, napi_call NError(BError(BError::Codes::SDK_INVAL_ARG, "Failed to get restoreSession entity.").GetCode()).ThrowErr(env); return nullptr; } - UniqueFd fd; - auto cbExec = [session {restoreEntity}, &fd]() -> NError { + auto fd = make_shared(); + auto cbExec = [session {restoreEntity}, fd]() -> NError { if (!session && (session->sessionWhole || session->sessionSheet)) { return NError(BError(BError::Codes::SDK_INVAL_ARG, "backup session is nullptr").GetCode()); } if (session->sessionWhole) { - fd = session->sessionWhole->GetLocalCapabilities(); + *fd = session->sessionWhole->GetLocalCapabilities(); } else if (session->sessionSheet) { - fd = session->sessionSheet->GetLocalCapabilities(); + *fd = session->sessionSheet->GetLocalCapabilities(); } - return fd < 0 ? NError(BError(BError::Codes::SA_INVAL_ARG, "Failed to get local capabilities.").GetCode()) : - NError(BError(BError::Codes::OK, "Success to get local capabilities.").GetCode()); + return NError(ERRNO_NOERR); }; - auto cbCompl = [&fd](napi_env env, NError err) -> NVal { + auto cbCompl = [fd](napi_env env, NError err) -> NVal { NVal obj = NVal::CreateObject(env); - obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd.Release()).val_)}); - return err ? NVal {env, err.GetNapiErr(env)} : obj; + obj.AddProp({NVal::DeclareNapiProperty(BConstants::FD.c_str(), NVal::CreateInt32(env, fd->Release()).val_)}); + return {obj}; }; NVal thisVar(env, funcArg.GetThisVar()); return NAsyncWorkPromise(env, thisVar).Schedule(className, cbExec, cbCompl).val_; diff --git a/services/backup_sa/src/module_ipc/service.cpp b/services/backup_sa/src/module_ipc/service.cpp index 2c00bcc514da6fe30c9931a30ef51f39baa34453..e9ab1c1ae9add34b4fd448d449f55ac679e89f2f 100644 --- a/services/backup_sa/src/module_ipc/service.cpp +++ b/services/backup_sa/src/module_ipc/service.cpp @@ -1653,7 +1653,7 @@ ErrCode Service::GetBackupInfo(const BundleName &bundleName, std::string &result return BError(BError::Codes::SA_INVAL_ARG); } if (session_->GetImpl().clientToken) { - return BError(BError::Codes::SA_REFUSED_ACT, "Already have an active session"); + HILOGI("Already have an active session, bundleName:%{public}s", bundleName.c_str()); } session_->IncreaseSessionCnt(__PRETTY_FUNCTION__); auto ret = GetBackupInfoCmdHandle(bundleName, result); diff --git a/utils/src/b_filesystem/b_dir.cpp b/utils/src/b_filesystem/b_dir.cpp index 2845338e4d6086644a0961141591cab2e3846212..9c2d44f014a5539dfdf4c355d2325f002880997c 100644 --- a/utils/src/b_filesystem/b_dir.cpp +++ b/utils/src/b_filesystem/b_dir.cpp @@ -296,8 +296,8 @@ tuple, map> BDir::GetBigFiles( HILOGW("GetBigFiles, path = %{public}s", item.c_str()); auto [errCode, files, smallFiles] = GetDirFilesDetail(item, true, BConstants::BIG_FILE_BOUNDARY); if (errCode == 0) { - incFiles.merge(move(files)); HILOGW("big files: %{public}zu; small files: %{public}zu", files.size(), smallFiles.size()); + incFiles.merge(move(files)); incSmallFiles.merge(move(smallFiles)); } }