summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2010-12-02 12:58:56 +0000
committerSimon MacMullen <simon@rabbitmq.com>2010-12-02 12:58:56 +0000
commitc7a3d3c7593b5cd80d41f8763263e43acf24a54c (patch)
treed6115b120a1efe556e08115e3c208dca13a21afd
parenta3af16f58808df6247a5a85d304f0b59eeadbc70 (diff)
parentfab2fe3d1851eac678f3633bd5923f06a0d89ea7 (diff)
downloadrabbitmq-server-c7a3d3c7593b5cd80d41f8763263e43acf24a54c.tar.gz
Merge heads
-rw-r--r--src/rabbit_amqqueue_process.erl5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 3dbd2b22..25859c22 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -491,9 +491,8 @@ attempt_delivery(#delivery{txn = none,
{AckTag, BQS1} =
BQ:publish_delivered(
AckRequired, Message,
- ?BASE_MESSAGE_PROPERTIES
- #message_properties{
- needs_confirming = NeedsConfirming},
+ (?BASE_MESSAGE_PROPERTIES)#message_properties{
+ needs_confirming = NeedsConfirming},
BQS),
{{Message, false, AckTag}, true,
State1#q{backing_queue_state = BQS1}}