hangup when closing socket with no pipes attached -- fixed

47c064f2 · Martin Sustrik · 090e460d · 47c064f2 · 47c064f2
Commit 47c064f2 authored Sep 01, 2010 by Martin Sustrik
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 0 deletions

fq.cpp src/fq.cpp +5 -0

lb.cpp src/lb.cpp +5 -0

No files found.
--- a/src/fq.cpp
+++ b/src/fq.cpp
@@ -75,6 +75,11 @@ void zmq::fq_t::terminate ()
 {
    terminating = true;

+    if (pipes.empty ()) {
+        sink->terminated ();
+        return;
+    }
+
    for (pipes_t::size_type i = 0; i != pipes.size (); i++)
        pipes [i]->terminate ();
 }

--- a/src/lb.cpp
+++ b/src/lb.cpp
@@ -54,6 +54,11 @@ void zmq::lb_t::terminate ()
 {
    terminating = true;

+    if (pipes.empty ()) {
+        sink->terminated ();
+        return;
+    }
+
    for (pipes_t::size_type i = 0; i != pipes.size (); i++)
        pipes [i]->terminate ();
 }