summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2013-05-01 10:59:16 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2013-05-01 10:59:16 +0100
commitc44afbbda908628527caf1dba399b49bf0653b43 (patch)
tree316bba1ec66bf536a0d2f5b8b8330a3caf378533
parent7475a7a9c18fe421c4c69f80903b5d8986c02741 (diff)
downloadrabbitmq-server-c44afbbda908628527caf1dba399b49bf0653b43.tar.gz
ever so slightly clearer
-rw-r--r--src/supervisor2.erl6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/supervisor2.erl b/src/supervisor2.erl
index 3b971739..8b0899a6 100644
--- a/src/supervisor2.erl
+++ b/src/supervisor2.erl
@@ -1258,14 +1258,12 @@ state_del_child(Child, State) ->
NChildren = del_child(Child#child.name, State#state.children),
State#state{children = NChildren}.
-del_child(Name, [Ch|Chs]) when Ch#child.name =:= Name, Ch#child.restart_type =:= temporary ->
+del_child(Name, [Ch=#child{pid = ?restarting(_)}|_]=Chs) when Ch#child.name =:= Name ->
Chs;
-del_child(Name, [Ch=#child{pid = ?restarting(_)}|_]=Chs)
- when Ch#child.name =:= Name ->
+del_child(Name, [Ch|Chs]) when Ch#child.name =:= Name, Ch#child.restart_type =:= temporary ->
Chs;
del_child(Name, [Ch|Chs]) when Ch#child.name =:= Name ->
[Ch#child{pid = undefined} | Chs];
-%% the next two clauses only handle deletions during a one_for_all restart
del_child(Pid, [Ch|Chs]) when Ch#child.pid =:= Pid, Ch#child.restart_type =:= temporary ->
Chs;
del_child(Pid, [Ch|Chs]) when Ch#child.pid =:= Pid ->