Snap for 9830776 from 87d077353e20dbe7981884287d20efc00c594b9b to udc-release (e61583af) · Commits · e / os / android_packages_modules_DnsResolver

res_cache.cpp

+23 −24

Original line number	Original line	Diff line number	Diff line
	@@ -1284,8 +1284,8 @@ ResolvCacheStatus resolv_cache_lookup(unsigned netid, span<const uint8_t> query,

	if (!cache_has_pending_request_locked(cache, &key, true)) {		if (!cache_has_pending_request_locked(cache, &key, true)) {
	return RESOLV_CACHE_NOTFOUND;		return RESOLV_CACHE_NOTFOUND;
			}

	} else {
	LOG(INFO) << __func__ << ": Waiting for previous request";		LOG(INFO) << __func__ << ": Waiting for previous request";
	// wait until (1) timeout OR		// wait until (1) timeout OR
	// (2) cv is notified AND no pending request matching the \|key\|		// (2) cv is notified AND no pending request matching the \|key\|
	@@ -1311,7 +1311,6 @@ ResolvCacheStatus resolv_cache_lookup(unsigned netid, span<const uint8_t> query,
	return RESOLV_CACHE_NOTFOUND;		return RESOLV_CACHE_NOTFOUND;
	}		}
	}		}
	}

	now = _time_now();		now = _time_now();