Merge pull request #1314 from topher200/master

Close messages that failed to send

Merge pull request #1314 from topher200/master
Close messages that failed to send
be23e699 · Joe Eli McIlvain · 94b0ad3e · 866a0465 · be23e699
Commit be23e699 authored Jan 20, 2015 by Joe Eli McIlvain
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

router.cpp src/router.cpp +9 -5

No files found.
--- a/src/router.cpp
+++ b/src/router.cpp
@@ -246,12 +246,16 @@ int zmq::router_t::xsend (msg_t *msg_)
        }
        bool ok = current_out->write (msg_);
-        if (unlikely (!ok))
+        if (unlikely (!ok)) {
-            current_out = NULL;
+            // Message failed to send - we must close it ourselves.
-        else
+            int rc = msg_->close ();
-        if (!more_out) {
+            errno_assert (rc == 0);
-            current_out->flush ();
            current_out = NULL;
+        } else {
+          if (!more_out) {
+              current_out->flush ();
+              current_out = NULL;
+          }
        }
    }
    else {