diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2012-10-16 16:24:14 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2012-10-16 16:24:14 +0100 |
| commit | 02961bbf081afdaa64c88d52d203ba4e1fe4b206 (patch) | |
| tree | 9be64ee0db5be8b5b67f1b45acfbcbcfde495466 | |
| parent | 049c5820c93c11e78c7f5c96946a0b3a1ba2a2c9 (diff) | |
| download | rabbitmq-server-git-02961bbf081afdaa64c88d52d203ba4e1fe4b206.tar.gz | |
Cosmetic
| -rw-r--r-- | src/rabbit_policy.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_vhost.erl | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/rabbit_policy.erl b/src/rabbit_policy.erl index 4039607abe..e8c1548a19 100644 --- a/src/rabbit_policy.erl +++ b/src/rabbit_policy.erl @@ -84,7 +84,7 @@ parse_set0(VHost, Key, Pattern, Defn, Priority) -> {ok, JSON} -> set0(VHost, Key, [{<<"pattern">>, list_to_binary(Pattern)}, {<<"policy">>, rabbit_misc:json_to_term(JSON)}] ++ - Priority); + Priority); error -> {error_string, "JSON decoding error"} end. diff --git a/src/rabbit_vhost.erl b/src/rabbit_vhost.erl index 68b04cb188..297fa56fe3 100644 --- a/src/rabbit_vhost.erl +++ b/src/rabbit_vhost.erl @@ -97,9 +97,7 @@ internal_delete(VHostPath) -> proplists:get_value(component, Info), proplists:get_value(key, Info)) || Info <- rabbit_runtime_parameters:list(VHostPath)], - [ok = rabbit_policy:delete( - VHostPath, - proplists:get_value(key, Info)) + [ok = rabbit_policy:delete(VHostPath, proplists:get_value(key, Info)) || Info <- rabbit_policy:list(VHostPath)], ok = mnesia:delete({rabbit_vhost, VHostPath}), ok. |