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

Unified Diff: net/socket/client_socket_pool_base.h

Issue 165218: Merge 21988 - Fix crash in client_socket_pool_base.cc.... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 years, 4 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 | net/socket/client_socket_pool_base.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/client_socket_pool_base.h
===================================================================
--- net/socket/client_socket_pool_base.h (revision 22878)
+++ net/socket/client_socket_pool_base.h (working copy)
@@ -196,7 +196,8 @@
Group() : active_socket_count(0) {}
bool IsEmpty() const {
- return active_socket_count == 0 && idle_sockets.empty() && jobs.empty();
+ return active_socket_count == 0 && idle_sockets.empty() && jobs.empty() &&
+ pending_requests.empty() && connecting_requests.empty();
}
bool HasAvailableSocketSlot(int max_sockets_per_group) const {
Property changes on: net\socket\client_socket_pool_base.h
___________________________________________________________________
Modified: svn:mergeinfo
Merged /trunk/src/net/socket/client_socket_pool_base.h:r21988
« no previous file with comments | « no previous file | net/socket/client_socket_pool_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698