3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 15:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1179 from hurtonm/master

Browse Source 
Stop session's timer when pipe terminates
This commit is contained in:
Pieter Hintjens 2014-09-12 17:25:47 +02:00
commit 4b70793f1f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/session_base.cpp
View File

@ -206,10 +206,14 @@ void zmq::session_base_t::pipe_terminated (pipe_t *pipe_)
|| pipe_ == zap_pipe || pipe_ == zap_pipe
|| terminating_pipes.count (pipe_) == 1); || terminating_pipes.count (pipe_) == 1);
if (pipe_ == pipe) if (pipe_ == pipe) {
// If this is our current pipe, remove it // If this is our current pipe, remove it
pipe = NULL; pipe = NULL;
else if (has_linger_timer) {
cancel_timer (linger_timer_id);
has_linger_timer = false;
}
} else
if (pipe_ == zap_pipe) if (pipe_ == zap_pipe)
zap_pipe = NULL; zap_pipe = NULL;
else else