summaryrefslogtreecommitdiff
path: root/src/socket_base.cpp
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2011-05-31 14:36:51 +0200
committerMartin Sustrik <sustrik@250bpm.com>2011-05-31 14:36:51 +0200
commita24a7c15a824bb48da38809bff9416673dc5a176 (patch)
treef952e4d06004f2ec0683fa47b5418b8b805ea799 /src/socket_base.cpp
parent0b59866a84f733e5a53b0d2f32570581691747ef (diff)
Session termination induced by socket fixed
Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
Diffstat (limited to 'src/socket_base.cpp')
-rw-r--r--src/socket_base.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index 59e2653..2b1d8af 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -233,7 +233,7 @@ void zmq::socket_base_t::attach_pipe (pipe_t *pipe_,
// straight away.
if (is_terminating ()) {
register_term_acks (1);
- pipe_->terminate ();
+ pipe_->terminate (false);
}
}
@@ -740,7 +740,7 @@ void zmq::socket_base_t::process_term (int linger_)
// Ask all attached pipes to terminate.
for (pipes_t::size_type i = 0; i != pipes.size (); ++i)
- pipes [i]->terminate ();
+ pipes [i]->terminate (false);
register_term_acks (pipes.size ());
// Continue the termination process immediately.