diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-10-03 13:21:13 +0100 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-10-03 13:21:13 +0100 |
| commit | 1256051aaa8466aefe058d7a1ac0b233ae6661b7 (patch) | |
| tree | 553e5cece8616c8245eec41961066c7e813efa33 /src | |
| parent | 0144b3ac3ed1a9c19ff067be4ae1349e641a595d (diff) | |
| parent | 5358502d77b771f38d9fc1116fe3ef60c0b1b20f (diff) | |
| download | rabbitmq-server-git-1256051aaa8466aefe058d7a1ac0b233ae6661b7.tar.gz | |
re-merge bug25200 into default
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue.erl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index adab5d032c..a8b0ea2438 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -632,7 +632,7 @@ deliver(Qs, Delivery = #delivery{mandatory = false}, Flow) -> %% We let slaves know that they were being addressed as slaves at %% the time - if they receive such a message from the channel %% after they have become master they should mark the message as - %% redelivered since they do not know what the master may have + %% 'delivered' since they do not know what the master may have %% done with it. MMsg = {deliver, Delivery, false, Flow}, SMsg = {deliver, Delivery, true, Flow}, @@ -644,6 +644,7 @@ deliver(Qs, Delivery = #delivery{mandatory = false}, Flow) -> deliver(Qs, Delivery, _Flow) -> {MPids, SPids} = qpids(Qs), + %% see comment above MMsg = {deliver, Delivery, false}, SMsg = {deliver, Delivery, true}, {MRouted, _} = delegate:invoke( |