summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2012-10-03 13:21:13 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2012-10-03 13:21:13 +0100
commit96c26ff8819e296efb4e809b18c3f2e7a6f5c66d (patch)
tree553e5cece8616c8245eec41961066c7e813efa33
parent1d3fa1819b5471fb8db5804f78d0c1bbe957b41e (diff)
parent4e02a2376ebc2d7e88c704e5f6e90f92e562f331 (diff)
downloadrabbitmq-server-96c26ff8819e296efb4e809b18c3f2e7a6f5c66d.tar.gz
re-merge bug25200 into default
-rw-r--r--src/rabbit_amqqueue.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index adab5d03..a8b0ea24 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(