summaryrefslogtreecommitdiffstats
path: root/net/websockets
diff options
context:
space:
mode:
authorukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-29 09:00:49 +0000
committerukai@chromium.org <ukai@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-29 09:00:49 +0000
commit909d274de04eecee37c295b2f88d094bac7a4987 (patch)
tree7fe68a750e3bf1a0fc9ca78dafe5edf6c70cb883 /net/websockets
parent5786be50790e761885b543a8a147340790dc62d8 (diff)
downloadchromium_src-909d274de04eecee37c295b2f88d094bac7a4987.zip
chromium_src-909d274de04eecee37c295b2f88d094bac7a4987.tar.gz
chromium_src-909d274de04eecee37c295b2f88d094bac7a4987.tar.bz2
Ignore OnConnected event if the job state is already CLOSED.
There is a case while SocketStream is connecting, WebSocketJob is closed and SocketStream notifies it is connected. In this case, we should just ignore OnConnected event. BUG=47818 TEST=websocket/tests/url-with-credential.html Review URL: http://codereview.chromium.org/2823034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@51108 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
-rw-r--r--net/websockets/websocket_job.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/websockets/websocket_job.cc b/net/websockets/websocket_job.cc
index 040fc4d..17dc54b 100644
--- a/net/websockets/websocket_job.cc
+++ b/net/websockets/websocket_job.cc
@@ -173,6 +173,8 @@ int WebSocketJob::OnStartOpenConnection(
void WebSocketJob::OnConnected(
SocketStream* socket, int max_pending_send_allowed) {
+ if (state_ == CLOSED)
+ return;
DCHECK_EQ(CONNECTING, state_);
if (delegate_)
delegate_->OnConnected(socket, max_pending_send_allowed);