Merge pull request #1511 from sorenh/linger_fix

Avoid terminating connections prematurely
zeromq · Aug 6, 2015 · 84a93d4 · 84a93d4
2 parents ba6e133 + abc845d
commit 84a93d4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/session_base.cpp b/src/session_base.cpp
@@ -460,7 +460,8 @@ void zmq::session_base_t::process_term (int linger_)
  // TODO: Should this go into pipe_t::terminate ?
  // In case there's no engine and there's only delimiter in the
  // pipe it wouldn't be ever read. Thus we check for it explicitly.
- pipe->check_read ();
+ if (!engine)
+ pipe->check_read ();
  }
 
  if (zap_pipe != NULL)