!46 fix logic problem when merge subscribe info

Merge pull request !46 from Gymee/code_review
This commit is contained in:
openharmony_ci
2022-03-07 13:52:26 +00:00
committed by Gitee
@@ -241,14 +241,12 @@ void DistributedDeviceProfileClient::MergeSubscribeInfoLocked(std::list<Subscrib
[&newSubscribeInfo](const auto& subscribeInfo) {
return subscribeInfo.profileEvent == newSubscribeInfo.profileEvent;
});
if (iter != subscribeInfos.end()) {
if (iter == subscribeInfos.end()) {
subscribeInfos.emplace_back(newSubscribeInfo);
continue;
}
// override with the new suscribe info for same profile event
if (*iter != newSubscribeInfo) {
*iter = newSubscribeInfo;
}
*iter = newSubscribeInfo;
}
}