Commit 7fbd9771 authored by Simon Giesecke's avatar Simon Giesecke

Problem: assertion triggered in stream_connecter_base::close

Solution: change into regular control flow condition
parent 2759f459
...@@ -130,7 +130,8 @@ void zmq::stream_connecter_base_t::rm_handle () ...@@ -130,7 +130,8 @@ void zmq::stream_connecter_base_t::rm_handle ()
void zmq::stream_connecter_base_t::close () void zmq::stream_connecter_base_t::close ()
{ {
zmq_assert (_s != retired_fd); // TODO before, this was an assertion for _s != retired_fd, but this does not match usage of close
if (_s != retired_fd) {
#ifdef ZMQ_HAVE_WINDOWS #ifdef ZMQ_HAVE_WINDOWS
const int rc = closesocket (_s); const int rc = closesocket (_s);
wsa_assert (rc != SOCKET_ERROR); wsa_assert (rc != SOCKET_ERROR);
...@@ -138,9 +139,10 @@ void zmq::stream_connecter_base_t::close () ...@@ -138,9 +139,10 @@ void zmq::stream_connecter_base_t::close ()
const int rc = ::close (_s); const int rc = ::close (_s);
errno_assert (rc == 0); errno_assert (rc == 0);
#endif #endif
_socket->event_closed (make_unconnected_connect_endpoint_pair (_endpoint), _socket->event_closed (
_s); make_unconnected_connect_endpoint_pair (_endpoint), _s);
_s = retired_fd; _s = retired_fd;
}
} }
void zmq::stream_connecter_base_t::in_event () void zmq::stream_connecter_base_t::in_event ()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment