diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2012-03-21 13:23:25 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2012-03-21 13:23:25 +0000 |
| commit | f660b80672d5d16976111d89f9345fe7f1e3246e (patch) | |
| tree | 0b9a8bb1965b96fddb3aea967de70e34698154da | |
| parent | b8d1bb86d576a2b1f0cd989af27d9b8b657878e7 (diff) | |
| download | rabbitmq-server-bug24774.tar.gz | |
And if an {intrinsic, Delay} child exits normally/shutdown, remember to really exit the supervisor.bug24774
| -rw-r--r-- | src/supervisor2.erl | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/supervisor2.erl b/src/supervisor2.erl index fd5f0f30..774b7007 100644 --- a/src/supervisor2.erl +++ b/src/supervisor2.erl @@ -565,6 +565,8 @@ do_restart_delay({RestartType, Delay}, Reason, Child, State) -> del_child_and_maybe_shutdown(intrinsic, Child, State) -> {shutdown, state_del_child(Child, State)}; +del_child_and_maybe_shutdown({intrinsic, _Delay}, Child, State) -> + {shutdown, state_del_child(Child, State)}; del_child_and_maybe_shutdown(_, Child, State) -> {ok, state_del_child(Child, State)}. |