diff options
author | Matthias Radestock <matthias@rabbitmq.com> | 2012-10-11 14:46:35 +0100 |
---|---|---|
committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-10-11 14:46:35 +0100 |
commit | 7fe89a881ed98badf5d1a1ce59322f8e658e28f1 (patch) | |
tree | 00e7cd08163fd3dbf6ee76aaa5a4690ce979b949 | |
parent | 4fecf72cd3f0f3a9d08f98e14ef55052722c8b94 (diff) | |
download | rabbitmq-server-7fe89a881ed98badf5d1a1ce59322f8e658e28f1.tar.gz |
remove a remnant of 'immediate'
-rw-r--r-- | src/rabbit_amqqueue_process.erl | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 30df2b5c..9706efbf 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -543,16 +543,10 @@ attempt_delivery(#delivery{sender = SenderPid, message = Message}, Props, {{Message, Props#message_properties.delivered, AckTag}, true, State1#q{backing_queue_state = BQS3}} end, false, State#q{backing_queue_state = BQS1}); - {Duplicate, BQS1} -> - %% if the message has previously been seen by the BQ then - %% it must have been seen under the same circumstances as - %% now: i.e. if it is now a deliver_immediately then it - %% must have been before. - {case Duplicate of - published -> true; - discarded -> false - end, - State#q{backing_queue_state = BQS1}} + {published, BQS1} -> + {true, State#q{backing_queue_state = BQS1}}; + {discarded, BQS1} -> + {false, State#q{backing_queue_state = BQS1}} end. deliver_or_enqueue(Delivery = #delivery{message = Message, |