summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Klishin <mklishin@pivotal.io>2017-04-06 07:12:16 +0300
committerMichael Klishin <mklishin@pivotal.io>2017-04-06 07:12:16 +0300
commit4b69f48b772590af7b75699c60f7bef4fbeac4c8 (patch)
treed883240bf1ffeabc5b77d0f2fd05220cc6e86396 /src
parentbeac7417153408cbbfa957d6b1ad0ca85dd948a7 (diff)
parent0b0308829c716d3226c4d71efefe4d0b5f57473c (diff)
downloadrabbitmq-server-git-4b69f48b772590af7b75699c60f7bef4fbeac4c8.tar.gz
Merge branch 'stable'
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_queue_master_location_misc.erl4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_queue_master_location_misc.erl b/src/rabbit_queue_master_location_misc.erl
index 2cc6d515f4..0b9efdd6fc 100644
--- a/src/rabbit_queue_master_location_misc.erl
+++ b/src/rabbit_queue_master_location_misc.erl
@@ -63,8 +63,8 @@ get_location(Queue=#amqqueue{})->
end.
get_location_mod_by_args(#amqqueue{arguments=Args}) ->
- case proplists:lookup(<<"x-queue-master-locator">> , Args) of
- {<<"x-queue-master-locator">> , Strategy} ->
+ case rabbit_misc:table_lookup(Args, <<"x-queue-master-locator">>) of
+ {_Type, Strategy} ->
case rabbit_queue_location_validator:validate_strategy(Strategy) of
Reply = {ok, _CB} -> Reply;
Error -> Error