diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-27 21:12:51 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-27 21:12:51 +0000 |
| commit | be5c616c2fc815e88b917e56c5076df3d260ab5c (patch) | |
| tree | 913718631a2f94d7e5d815fb44f02bb996246273 | |
| parent | c1d0d81f1fbb7de859d0d6aba90b0a1768c9d7a6 (diff) | |
| download | chromium_src-be5c616c2fc815e88b917e56c5076df3d260ab5c.zip chromium_src-be5c616c2fc815e88b917e56c5076df3d260ab5c.tar.gz chromium_src-be5c616c2fc815e88b917e56c5076df3d260ab5c.tar.bz2 | |
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
| -rw-r--r-- | net/base/host_resolver_impl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
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, |