summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-19 22:32:30 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-04-19 22:32:30 +0000
commit74d7e1d0cb8040ba0bfe15619ccb240e5c7d5c19 (patch)
tree576a0f758edf6643818c18b928279022fec6f06a
parenta2e42e8ec6518e502634f6a49124bc1098db2c0a (diff)
downloadchromium_src-74d7e1d0cb8040ba0bfe15619ccb240e5c7d5c19.zip
chromium_src-74d7e1d0cb8040ba0bfe15619ccb240e5c7d5c19.tar.gz
chromium_src-74d7e1d0cb8040ba0bfe15619ccb240e5c7d5c19.tar.bz2
SPDY: Remove invalid DCHECK.
After GOAWAY frame support, it's possible for multiple SpdySessions to exist for the same host port pair. Review URL: http://codereview.chromium.org/1630029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44971 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/spdy/spdy_session.cc2
-rw-r--r--net/spdy/spdy_session_unittest.cc5
2 files changed, 5 insertions, 2 deletions
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 138deb9..54e80c9 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -229,8 +229,6 @@ SpdySession::~SpdySession() {
connection_->socket()->Disconnect();
}
- DCHECK(!session_->spdy_session_pool()->HasSession(host_port_pair()));
-
// Record per-session histograms here.
UMA_HISTOGRAM_CUSTOM_COUNTS("Net.SpdyStreamsPerSession",
streams_initiated_count_,
diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc
index ece870c..471a52f 100644
--- a/net/spdy/spdy_session_unittest.cc
+++ b/net/spdy/spdy_session_unittest.cc
@@ -131,6 +131,11 @@ TEST_F(SpdySessionTest, GoAway) {
MessageLoop::current()->RunAllPending();
EXPECT_FALSE(spdy_session_pool->HasSession(test_host_port_pair));
+
+ scoped_refptr<SpdySession> session2 =
+ spdy_session_pool->Get(test_host_port_pair, http_session.get());
+
+ session = NULL;
}
} // namespace