summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2012-08-20 10:57:03 +0100
committerEmile Joubert <emile@rabbitmq.com>2012-08-20 10:57:03 +0100
commit08feeff0ab1fe029380ef4f0f20dfd895986ca0a (patch)
treea4a2726f3c0f6f41036f52aa7c92f61cf717bdba /src
parentf4dd395823b0ffedd6d50d371b383fd684b1a61b (diff)
parent0757bf49366f1f5b89aad655dd42dc9f2d83530f (diff)
downloadrabbitmq-server-git-08feeff0ab1fe029380ef4f0f20dfd895986ca0a.tar.gz
Merged bug25104 into default
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_mirror_queue_misc.erl4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/rabbit_mirror_queue_misc.erl b/src/rabbit_mirror_queue_misc.erl
index 29e2d29f5c..89e334ddd2 100644
--- a/src/rabbit_mirror_queue_misc.erl
+++ b/src/rabbit_mirror_queue_misc.erl
@@ -64,9 +64,7 @@ remove_from_queue(QueueName, DeadPids) ->
slave_pids = SPids }] ->
[QPid1 | SPids1] = Alive =
[Pid || Pid <- [QPid | SPids],
- not lists:member(node(Pid),
- DeadNodes) orelse
- rabbit_misc:is_process_alive(Pid)],
+ not lists:member(node(Pid), DeadNodes)],
case {{QPid, SPids}, {QPid1, SPids1}} of
{Same, Same} ->
{ok, QPid1, []};