diff options
| -rw-r--r-- | net/socket/client_socket_pool_base.cc | 1 | ||||
| -rw-r--r-- | net/socket/client_socket_pool_base.h | 3 | ||||
| -rw-r--r-- | net/socket/tcp_client_socket_pool.cc | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/net/socket/client_socket_pool_base.cc b/net/socket/client_socket_pool_base.cc index 2a32e4d..0afe53e 100644 --- a/net/socket/client_socket_pool_base.cc +++ b/net/socket/client_socket_pool_base.cc @@ -307,6 +307,7 @@ void ClientSocketPoolBase::OnConnectJobComplete(int result, ConnectJob* job) { RemoveConnectJob(job->key_handle()); if (result != OK) { + DCHECK(!socket.get()); callback->Run(result); // |group| is not necessarily valid after this. // |group| may be invalid after the callback, we need to search // |group_map_| again. diff --git a/net/socket/client_socket_pool_base.h b/net/socket/client_socket_pool_base.h index 8c4b3e7..b7df105 100644 --- a/net/socket/client_socket_pool_base.h +++ b/net/socket/client_socket_pool_base.h @@ -52,7 +52,8 @@ class ConnectJob { LoadState load_state() const { return load_state_; } const ClientSocketHandle* key_handle() const { return key_handle_; } - // Releases |socket_| to the client. + // Releases |socket_| to the client. On connection error, this should return + // NULL. ClientSocket* ReleaseSocket() { return socket_.release(); } // Begins connecting the socket. Returns OK on success, ERR_IO_PENDING if it diff --git a/net/socket/tcp_client_socket_pool.cc b/net/socket/tcp_client_socket_pool.cc index a5b5595..6b3fd05 100644 --- a/net/socket/tcp_client_socket_pool.cc +++ b/net/socket/tcp_client_socket_pool.cc @@ -114,6 +114,9 @@ int TCPConnectJob::DoTCPConnectComplete(int result) { base::TimeDelta::FromMilliseconds(1), base::TimeDelta::FromMinutes(10), 100); + } else { + // Delete the socket on error. + set_socket(NULL); } return result; |