diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-10-12 16:51:23 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-10-12 16:51:23 +0100 |
| commit | f03fb1de8aee88b9cf06559e20bee41ccc58a867 (patch) | |
| tree | 9ab00e5334f4f12c87fc0eaf7f587fb574b45f15 | |
| parent | df71d93c434f7e0eafe8ad4d0f75da6da3e926e8 (diff) | |
| parent | 422b8598e54a25b1b868092e2c454e86eaebf807 (diff) | |
| download | rabbitmq-server-git-f03fb1de8aee88b9cf06559e20bee41ccc58a867.tar.gz | |
Merge heads
| -rw-r--r-- | src/rabbit_mirror_queue_master.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rabbit_mirror_queue_master.erl b/src/rabbit_mirror_queue_master.erl index d865d6751b..6dac280851 100644 --- a/src/rabbit_mirror_queue_master.erl +++ b/src/rabbit_mirror_queue_master.erl @@ -379,8 +379,10 @@ discard(Msg = #basic_message { id = MsgId }, ChPid, case dict:find(MsgId, SS) of error -> ok = gm:broadcast(GM, {discard, ChPid, Msg}), - State #state { backing_queue_state = BQ:discard(Msg, ChPid, BQS), - seen_status = dict:erase(MsgId, SS) }; + ensure_monitoring( + ChPid, State #state { + backing_queue_state = BQ:discard(Msg, ChPid, BQS), + seen_status = dict:erase(MsgId, SS) }); {ok, discarded} -> State end. |