diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-17 09:34:13 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-03-17 09:34:13 +0000 |
| commit | e74f420db40c772e77454dd05f32f7c172a2156a (patch) | |
| tree | 10e4adcbb76f11c25b9c3b977f2e240a55659cb6 | |
| parent | 7556d6ae1e71ffc07dab7666216e94bbd91c1dec (diff) | |
| download | rabbitmq-server-bug23929.tar.gz | |
and again, _don't_ record confirm on immediate if we don't deliver...bug23929
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index 4ebdb7a3..3f5758ce 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -838,7 +838,10 @@ handle_call({deliver_immediately, Delivery}, _From, State) -> %% queues discarding the message? %% {Delivered, Confirm, State1} = attempt_delivery(Delivery, State), - reply(Delivered, maybe_record_confirm_message(Confirm, State1)); + reply(Delivered, case Delivered of + true -> maybe_record_confirm_message(Confirm, State1); + false -> State1 + end); handle_call({deliver, Delivery}, From, State) -> %% Synchronous, "mandatory" delivery mode. Reply asap. |