summaryrefslogtreecommitdiff
path: root/src/pipe.cpp
diff options
context:
space:
mode:
authorMartin Sustrik <sustrik@250bpm.com>2010-08-28 08:44:12 +0200
committerMartin Sustrik <sustrik@250bpm.com>2010-08-28 08:44:12 +0200
commit92923cd40b645af844c5ed1055a0a45c6daa3c89 (patch)
tree9543dfec1918d142dd757bcf1378af65ecea6e3d /src/pipe.cpp
parent035c937ee7452708a9dd3abd851fda6a753808f4 (diff)
bug in pipe deactivation fixed
Diffstat (limited to 'src/pipe.cpp')
-rw-r--r--src/pipe.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/pipe.cpp b/src/pipe.cpp
index 5780635..8785330 100644
--- a/src/pipe.cpp
+++ b/src/pipe.cpp
@@ -80,11 +80,8 @@ bool zmq::reader_t::check_read ()
return false;
// Check if there's an item in the pipe.
- // If not, deactivate the pipe.
- if (!pipe->check_read ()) {
- terminate ();
+ if (!pipe->check_read ())
return false;
- }
// If the next item in the pipe is message delimiter,
// initiate its termination.
@@ -198,7 +195,8 @@ bool zmq::writer_t::check_write ()
if (terminating)
return false;
- if (pipe_full () && (msg_store == NULL || msg_store->full () || extra_msg_flag)) {
+ if (pipe_full () && (msg_store == NULL || msg_store->full () ||
+ extra_msg_flag)) {
stalled = true;
return false;
}