diff options
| author | Daniil Fedotov <dfedotov@pivotal.io> | 2016-04-19 17:15:18 +0100 |
|---|---|---|
| committer | Daniil Fedotov <dfedotov@pivotal.io> | 2016-04-19 17:15:18 +0100 |
| commit | e115ccbf74ad57c60566ab3cbbee8b04126c3de6 (patch) | |
| tree | 9897b134bbfbd86441ef9eae294326f96a2e6b64 | |
| parent | 8bc324f90e6a4243bd385176a7aae69092f1cefe (diff) | |
| parent | 0df4e53f356a184245eec7729dfbcd75392563e6 (diff) | |
| download | rabbitmq-server-git-e115ccbf74ad57c60566ab3cbbee8b04126c3de6.tar.gz | |
Merge branch 'stable'
| -rw-r--r-- | src/rabbit_policy.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rabbit_policy.erl b/src/rabbit_policy.erl index 1f7e521dfd..d04551043e 100644 --- a/src/rabbit_policy.erl +++ b/src/rabbit_policy.erl @@ -242,8 +242,10 @@ update_policies(VHost) -> fun() -> [mnesia:lock({table, T}, write) || T <- Tabs], %% [1] case catch list(VHost) of - {error, {no_such_vhost, _}} -> - ok; %% [2] + {'EXIT', {throw, {error, {no_such_vhost, _}}}} -> + {[], []}; %% [2] + {'EXIT', Exit} -> + exit(Exit); Policies -> {[update_exchange(X, Policies) || X <- rabbit_exchange:list(VHost)], |