diff options
| author | Rob Harrop <rob@rabbitmq.com> | 2011-03-04 11:20:43 +0000 |
|---|---|---|
| committer | Rob Harrop <rob@rabbitmq.com> | 2011-03-04 11:20:43 +0000 |
| commit | 47c823619d28981fb6c08e41b1dca3441b741d9a (patch) | |
| tree | c24a3516baac637cf579356faa6af542e996a454 /src | |
| parent | 504d2fa18029ad0fcfd9fc1fbd429bb3822068de (diff) | |
| parent | 3a5fcb8a20c07a2908452e368c7d25e776dabe53 (diff) | |
| download | rabbitmq-server-git-47c823619d28981fb6c08e41b1dca3441b741d9a.tar.gz | |
Merge with default
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_variable_queue.erl | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl index d1307b8527..58a28d3247 100644 --- a/src/rabbit_variable_queue.erl +++ b/src/rabbit_variable_queue.erl @@ -510,8 +510,13 @@ publish(Msg, MsgProps, State) -> a(reduce_memory_use(State1)). publish_delivered(false, #basic_message { guid = Guid }, - _MsgProps, State = #vqstate { len = 0 }) -> - blind_confirm(self(), gb_sets:singleton(Guid)), + #message_properties { + needs_confirming = NeedsConfirming }, + State = #vqstate { len = 0 }) -> + case NeedsConfirming of + true -> blind_confirm(self(), gb_sets:singleton(Guid)); + false -> ok + end, {undefined, a(State)}; publish_delivered(true, Msg = #basic_message { is_persistent = IsPersistent, guid = Guid }, |