Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(668)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/base/host_resolver_impl.cc

Issue 1518037: Cancel IPv6 probe jobs during shutdown.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Add a DCHECK for shutdown Created 10 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/host_resolver_impl.cc
===================================================================
--- net/base/host_resolver_impl.cc (revision 44558)
+++ net/base/host_resolver_impl.cc (working copy)
@@ -851,6 +851,7 @@
for (JobMap::iterator it = jobs_.begin(); it != jobs_.end(); ++it)
it->second->Cancel();
jobs_.clear();
+ DiscardIPv6ProbeJob();
}
void HostResolverImpl::ClearRequestsTrace() {
@@ -1078,6 +1079,9 @@
if (cache_.get())
cache_->clear();
if (ipv6_probe_monitoring_) {
+ DCHECK(!shutdown_);
+ if (shutdown_)
+ return;
DiscardIPv6ProbeJob();
ipv6_probe_job_ = new IPv6ProbeJob(this);
ipv6_probe_job_->Start();
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698