From be5c616c2fc815e88b917e56c5076df3d260ab5c Mon Sep 17 00:00:00 2001 From: "eroman@chromium.org" Date: Tue, 27 Jul 2010 21:12:51 +0000 Subject: Avoid printing log errors during shutdown of HostResolverImpl when there are still requests outstanding. BUG=49692 Review URL: http://codereview.chromium.org/3023011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53837 0039d316-1c4b-4281-b951-d872f2087c98 --- net/base/host_resolver_impl.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'net/base') diff --git a/net/base/host_resolver_impl.cc b/net/base/host_resolver_impl.cc index 0f2e5f0..8d5fe26 100644 --- a/net/base/host_resolver_impl.cc +++ b/net/base/host_resolver_impl.cc @@ -907,13 +907,14 @@ void HostResolverImpl::ProbeIPv6Support() { void HostResolverImpl::Shutdown() { DCHECK(CalledOnValidThread()); - shutdown_ = true; // Cancel the outstanding jobs. for (JobMap::iterator it = jobs_.begin(); it != jobs_.end(); ++it) it->second->Cancel(); jobs_.clear(); DiscardIPv6ProbeJob(); + + shutdown_ = true; } void HostResolverImpl::SetPoolConstraints(JobPoolIndex pool_index, -- cgit v1.1