Merge "QueueTest: Only set promise value when the key is removed" into tm-qpr-dev (e5e357d1) · Commits · e / os / android_packages_modules_Bluetooth

system/gd/os/linux_generic/queue_unittest.cc

+9 −8

Original line number	Original line	Diff line number	Diff line
	@@ -96,11 +96,12 @@ class TestEnqueueEnd {
	queue_->UnregisterEnqueue();		queue_->UnregisterEnqueue();
	}		}

	auto pair = promise_map_->find(buffer_.size());		auto key = buffer_.size();
	if (pair != promise_map_->end()) {		auto node = promise_map_->extract(key);
	pair->second.set_value(pair->first);		if (node) {
	promise_map_->erase(pair->first);		node.mapped().set_value(key);
	}		}

	return data;		return data;
	}		}

	@@ -161,10 +162,10 @@ class TestDequeueEnd {
	queue_->UnregisterDequeue();		queue_->UnregisterDequeue();
	}		}

	auto pair = promise_map_->find(buffer_.size());		auto key = buffer_.size();
	if (pair != promise_map_->end()) {		auto node = promise_map_->extract(key);
	pair->second.set_value(pair->first);		if (node) {
	promise_map_->erase(pair->first);		node.mapped().set_value(key);
	}		}
	}		}