diff options
| -rw-r--r-- | src/rabbit_channel.erl | 7 | ||||
| -rw-r--r-- | test/quorum_queue_SUITE.erl | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index 996774fe35..d1f3b06528 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -2527,9 +2527,10 @@ maybe_monitor_all([], S) -> S; %% optimisation maybe_monitor_all([Item], S) -> maybe_monitor(Item, S); %% optimisation maybe_monitor_all(Items, S) -> lists:foldl(fun maybe_monitor/2, S, Items). -add_delivery_count_header(MsgHeader, Msg) -> - Count = maps:get(delivery_count, MsgHeader, 0), - rabbit_basic:add_header(<<"x-delivery-count">>, long, Count, Msg). +add_delivery_count_header(#{delivery_count := Count}, Msg) -> + rabbit_basic:add_header(<<"x-delivery-count">>, long, Count, Msg); +add_delivery_count_header(_, Msg) -> + Msg. qpid_to_ref(Pid) when is_pid(Pid) -> Pid; qpid_to_ref({Name, _}) -> Name; diff --git a/test/quorum_queue_SUITE.erl b/test/quorum_queue_SUITE.erl index d698618494..6f06f3b874 100644 --- a/test/quorum_queue_SUITE.erl +++ b/test/quorum_queue_SUITE.erl @@ -1988,7 +1988,7 @@ subscribe_redelivery_count(Config) -> {#'basic.deliver'{delivery_tag = DeliveryTag, redelivered = false}, #amqp_msg{props = #'P_basic'{headers = H0}}} -> - ?assertMatch({DTag, _, 0}, rabbit_basic:header(DTag, H0)), + ?assertMatch(undefined, rabbit_basic:header(DTag, H0)), amqp_channel:cast(Ch, #'basic.nack'{delivery_tag = DeliveryTag, multiple = false, requeue = true}) |