diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-12-20 13:04:18 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-12-20 13:04:18 +0000 |
| commit | 5beb2aa5d34dec6cfe1bc994112a9d76dbc12840 (patch) | |
| tree | d225a578d620ec42f1985a1027d7c38b31f49d26 /src | |
| parent | 3d3f7c6de807e2770460d8369482f6dabf5148f8 (diff) | |
| parent | a1b63d6cbe42bbc8da8c23b0dff32d7e69bb3db8 (diff) | |
| download | rabbitmq-server-git-5beb2aa5d34dec6cfe1bc994112a9d76dbc12840.tar.gz | |
merge default into bug23619
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_amqqueue.erl | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl index 08917df5fa..35ed1c94d6 100644 --- a/src/rabbit_amqqueue.erl +++ b/src/rabbit_amqqueue.erl @@ -503,15 +503,13 @@ pseudo_queue(QueueName, Pid) -> pid = Pid}. safe_delegate_call_ok(F, Pids) -> - {_, Bad} = delegate:invoke(Pids, - fun (Pid) -> + case delegate:invoke(Pids, fun (Pid) -> rabbit_misc:with_exit_handler( fun () -> ok end, fun () -> F(Pid) end) - end), - case Bad of - [] -> ok; - _ -> {error, Bad} + end) of + {_, []} -> ok; + {_, Bad} -> {error, Bad} end. delegate_call(Pid, Msg, Timeout) -> |