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

Merge pull request #291 from rcxdude/bugfix

Browse Source 
Fix for issue #307
This commit is contained in:
Ian Barber 2012-03-26 08:12:53 -07:00
commit 4c93fc2587
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/dist.cpp
View File

@ -139,7 +139,8 @@ void zmq::dist_t::distribute (msg_t *msg_, int flags_)
if (msg_->is_vsm ()) { if (msg_->is_vsm ()) {
for (pipes_t::size_type i = 0; i < matching; ++i) for (pipes_t::size_type i = 0; i < matching; ++i)
write (pipes [i], msg_); if(!write (pipes [i], msg_))
--i; // Retry last write because index will have been swapped
int rc = msg_->close(); int rc = msg_->close();
errno_assert (rc == 0); errno_assert (rc == 0);
rc = msg_->init (); rc = msg_->init ();
@ -154,8 +155,10 @@ void zmq::dist_t::distribute (msg_t *msg_, int flags_)
// Push copy of the message to each matching pipe. // Push copy of the message to each matching pipe.
int failed = 0; int failed = 0;
for (pipes_t::size_type i = 0; i < matching; ++i) for (pipes_t::size_type i = 0; i < matching; ++i)
if (!write (pipes [i], msg_)) if (!write (pipes [i], msg_)) {
++failed; ++failed;
--i; // Retry last write because index will have been swapped
}
if (unlikely (failed)) if (unlikely (failed))
msg_->rm_refs (failed); msg_->rm_refs (failed);