TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'google3' to roll forward to cl/350492846.

Browse Source
This commit is contained in:
edwinwutw
2021-01-08 01:01:41 +08:00
parent 183aed7f6c f93ad3beb1
commit 085907fea9
11 changed files with 856 additions and 896 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpp/core/internal/payload_manager.cc
+5
View File
@@ -1041,6 +1041,11 @@ void PayloadManager::PendingPayloads::StartTrackingPayload(
Payload::Id payload_id, std::unique_ptr<PendingPayload> pending_payload) {
MutexLock lock(&mutex_);
// If the |payload_id| is being re-used, always prefer the newer payload.
auto it = pending_payloads_.find(payload_id);
if (it != pending_payloads_.end()) {
pending_payloads_.erase(payload_id);
}
auto pair = pending_payloads_.emplace(payload_id, std::move(pending_payload));
NEARBY_LOG(INFO, "StartTrackingPayload: payload_id=%" PRIX64 "; inserted=%d",
payload_id, pair.second);