Merge pull request zeromq#99 from leewoosung/hotfixes/patched

Backport for LIBZMQ-541 fix
LuaDist · Jul 15, 2013 · 2aca7b2 · 2aca7b2
2 parents 00c0d58 + 1b5b18c
commit 2aca7b2
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/dist.cpp b/src/dist.cpp
@@ -80,12 +80,19 @@ void zmq::dist_t::terminated (pipe_t *pipe_)
 {
  // Remove the pipe from the list; adjust number of matching, active and/or
  // eligible pipes accordingly.
- if (pipes.index (pipe_) < matching)
+ if (pipes.index (pipe_) < matching) {
+ pipes.swap (pipes.index (pipe_), matching - 1);
  matching--;
- if (pipes.index (pipe_) < active)
+ }
+ if (pipes.index (pipe_) < active) {
+ pipes.swap (pipes.index (pipe_), active - 1);
  active--;
- if (pipes.index (pipe_) < eligible)
+ }
+ if (pipes.index (pipe_) < eligible) {
+ pipes.swap (pipes.index (pipe_), eligible - 1);
  eligible--;
+ }
+
  pipes.erase (pipe_);
 }