summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authormbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 18:55:25 +0000
committermbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-21 18:55:25 +0000
commit382d90334654b8b2bf0ed9061135d21ec3bfe0c5 (patch)
treec311b1d62a53562184fdd5fb3aeca214708fb443 /net
parent69d717bd97afda07c4f87d50559bdbff5b8018e4 (diff)
downloadchromium_src-382d90334654b8b2bf0ed9061135d21ec3bfe0c5.zip
chromium_src-382d90334654b8b2bf0ed9061135d21ec3bfe0c5.tar.gz
chromium_src-382d90334654b8b2bf0ed9061135d21ec3bfe0c5.tar.bz2
With the GOAWAY code we now can have a case where we attempt
to remove the session from the pool twice. Recover, instead of abort, on that case. Caught by existing test case already. TBR=willchan BUG=none TEST=SpdyNetworkTransactionTest.GoAwayWithActiveStream git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45211 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/spdy/spdy_session_pool.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/spdy/spdy_session_pool.cc b/net/spdy/spdy_session_pool.cc
index 5cfd62c..1a1141f 100644
--- a/net/spdy/spdy_session_pool.cc
+++ b/net/spdy/spdy_session_pool.cc
@@ -65,7 +65,8 @@ bool SpdySessionPool::HasSession(const HostPortPair& host_port_pair) const {
void SpdySessionPool::Remove(const scoped_refptr<SpdySession>& session) {
SpdySessionList* list = GetSessionList(session->host_port_pair());
- CHECK(list);
+ if (!list)
+ return;
list->remove(session);
if (list->empty())
RemoveSessionList(session->host_port_pair());