diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2017-04-06 07:47:56 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2017-04-06 07:47:56 +0300 |
| commit | 8ce0f08268df289ce9bf8d7d4096d3db4816fcf0 (patch) | |
| tree | fbe225b75314e2ac91780a50ce3372525523e296 /src | |
| parent | 03f4894afde146f933f70acce58bac23367bba6b (diff) | |
| parent | 4b69f48b772590af7b75699c60f7bef4fbeac4c8 (diff) | |
| download | rabbitmq-server-git-8ce0f08268df289ce9bf8d7d4096d3db4816fcf0.tar.gz | |
Merge branch 'master' into rabbitmq-server-1143
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_queue_master_location_misc.erl | 4 |
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 |