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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/client_socket_pool_base.cc

Issue 159597: Fix crash in client_socket_pool_base.cc. (Closed)
Patch Set: add test for late binding scenario Created 11 years, 5 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 | « net/socket/client_socket_pool_base.h ('k') | net/socket/client_socket_pool_base_unittest.cc » ('j') | net/socket/client_socket_pool_base_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/client_socket_pool_base.cc
diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc
index d10cf6009faa52f0852657bd47a1070c18f87368..db3858dcd458e566c33f943c8c38d66a44fe5b01 100644
--- a/net/socket/client_socket_pool_base.cc
+++ b/net/socket/client_socket_pool_base.cc
@@ -146,9 +146,8 @@ int ClientSocketPoolBase::RequestSocket(
connect_job_map_[handle] = job;
}
group.jobs.insert(job);
- } else {
- if (group.IsEmpty())
- group_map_.erase(group_name);
+ } else if (group.IsEmpty()) {
+ group_map_.erase(group_name);
}
return rv;
@@ -281,7 +280,6 @@ void ClientSocketPoolBase::CleanupIdleSockets(bool force) {
// Delete group if no longer needed.
if (group.IsEmpty()) {
- CHECK(group.pending_requests.empty());
group_map_.erase(i++);
} else {
++i;
@@ -521,7 +519,6 @@ void ClientSocketPoolBase::CancelAllConnectJobs() {
// Delete group if no longer needed.
if (group.IsEmpty()) {
- CHECK(group.pending_requests.empty());
group_map_.erase(i++);
} else {
++i;
« no previous file with comments | « net/socket/client_socket_pool_base.h ('k') | net/socket/client_socket_pool_base_unittest.cc » ('j') | net/socket/client_socket_pool_base_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698