mirror of
https://gitee.com/openharmony/filemanagement_dfs_service
synced 2024-11-23 08:00:07 +00:00
增加判空逻辑
Signed-off-by: fengjq <fengjunqing1@huawei.com>
This commit is contained in:
parent
1292964239
commit
f5544eba56
@ -206,7 +206,7 @@ int32_t CloudSyncManagerImpl::NotifyEventChange(
|
||||
}
|
||||
|
||||
SetDeathRecipient(CloudSyncServiceProxy->AsObject());
|
||||
|
||||
|
||||
int32_t ret = CloudSyncServiceProxy->NotifyEventChange(userId, eventId, extraData);
|
||||
LOGI("NotifyDataChange ret %{public}d", ret);
|
||||
return ret;
|
||||
@ -303,19 +303,19 @@ int32_t CloudSyncManagerImpl::RegisterDownloadFileCallback(
|
||||
LOGE("proxy is null");
|
||||
return E_SA_LOAD_FAILED;
|
||||
}
|
||||
int32_t ret = E_OK;
|
||||
{
|
||||
unique_lock<mutex> lock(downloadMutex_);
|
||||
ret = CloudSyncServiceProxy->RegisterDownloadFileCallback(
|
||||
sptr(new (std::nothrow) CloudDownloadCallbackClient(downloadCallback)));
|
||||
LOGI("RegisterDownloadFileCallback ret %{public}d", ret);
|
||||
if (ret == E_OK) {
|
||||
auto dlCallback = sptr(new (std::nothrow) CloudDownloadCallbackClient(downloadCallback));
|
||||
if (dlCallback == nullptr ||
|
||||
CloudSyncServiceProxy->RegisterDownloadFileCallback(dlCallback) != E_OK) {
|
||||
LOGE("register download callback failed");
|
||||
} else {
|
||||
downloadCallback_ = downloadCallback;
|
||||
}
|
||||
}
|
||||
SubscribeListener();
|
||||
SetDeathRecipient(CloudSyncServiceProxy->AsObject());
|
||||
return ret;
|
||||
return E_OK;
|
||||
}
|
||||
|
||||
int32_t CloudSyncManagerImpl::UnregisterDownloadFileCallback()
|
||||
@ -441,9 +441,9 @@ bool CloudSyncManagerImpl::ResetProxyCallback(uint32_t retryCount, const string
|
||||
{
|
||||
unique_lock<mutex> downloadLock(downloadMutex_);
|
||||
if (downloadCallback_ != nullptr) {
|
||||
auto ret = cloudSyncServiceProxy->RegisterDownloadFileCallback(
|
||||
sptr(new (std::nothrow) CloudDownloadCallbackClient(downloadCallback_)));
|
||||
if (ret != E_OK) {
|
||||
auto dlCallback = sptr(new (std::nothrow) CloudDownloadCallbackClient(downloadCallback_));
|
||||
if (dlCallback == nullptr ||
|
||||
cloudSyncServiceProxy->RegisterDownloadFileCallback(dlCallback) != E_OK) {
|
||||
LOGW("register download callback failed, try time is %{public}d", retryCount);
|
||||
} else {
|
||||
hasCallback = true;
|
||||
@ -451,9 +451,9 @@ bool CloudSyncManagerImpl::ResetProxyCallback(uint32_t retryCount, const string
|
||||
}
|
||||
}
|
||||
if (callback_ != nullptr) {
|
||||
auto ret = cloudSyncServiceProxy->RegisterCallbackInner(
|
||||
sptr(new (std::nothrow) CloudSyncCallbackClient(callback_)), bundleName);
|
||||
if (ret != E_OK) {
|
||||
auto callback = sptr(new (std::nothrow) CloudSyncCallbackClient(callback_));
|
||||
if (callback == nullptr ||
|
||||
cloudSyncServiceProxy->RegisterCallbackInner(callback, bundleName) != E_OK) {
|
||||
LOGW("register callback failed, try time is %{public}d", retryCount);
|
||||
} else {
|
||||
hasCallback = true;
|
||||
|
Loading…
Reference in New Issue
Block a user