summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Harrop <rharrop@vmware.com>2010-10-06 21:42:52 +0100
committerRob Harrop <rharrop@vmware.com>2010-10-06 21:42:52 +0100
commit7abf32f6872b951c2185118262eb5834680812ed (patch)
treef24443800e1e3327685bde67a9c69135283d3e66
parentde31efa054eb147908b8a789124c9d845a25362a (diff)
downloadrabbitmq-server-7abf32f6872b951c2185118262eb5834680812ed.tar.gz
fixed comment for attempt_delivery
-rw-r--r--src/rabbit_amqqueue_process.erl5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 95a5070b..5dd74dbf 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -422,6 +422,9 @@ attempt_delivery(none, _ChPid, Message, State = #q{backing_queue = BQ}) ->
PredFun = fun (IsEmpty, _State) -> not IsEmpty end,
DeliverFun =
fun (AckRequired, false, State1 = #q{backing_queue_state = BQS}) ->
+ %% we don't need an expiry here because messages are
+ %% not being enqueued, so we use an empty
+ %% message_properties.
{AckTag, BQS1} =
BQ:publish_delivered(AckRequired, Message,
?BASE_MESSAGE_PROPERTIES, BQS),
@@ -751,8 +754,6 @@ handle_call({deliver_immediately, Txn, Message, ChPid}, _From, State) ->
%% queues discarding the message?
%%
- %% we don't need an expiry here because messages are not being
- %% enqueued, so we use an empty message_properties.
{Delivered, NewState} = attempt_delivery(Txn, ChPid, Message, State),
reply(Delivered, NewState);