diff options
| author | Siri Hansen <[email protected]> | 2011-06-20 11:58:10 +0200 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2011-06-20 11:58:10 +0200 |
| commit | 22d7ccd9ef7f07baa0ffa648c16f90bfd2c0e342 (patch) | |
| tree | 1b7c243028681593478390e643368188c9509035 /lib/stdlib/src/supervisor.erl | |
| parent | 4dbcaa8fa84d6aa0a70a5fac9465dd7cbf2b0c76 (diff) | |
| parent | a8b656a0908d3af0d6776b662be5280867593be4 (diff) | |
| download | otp-22d7ccd9ef7f07baa0ffa648c16f90bfd2c0e342.tar.gz otp-22d7ccd9ef7f07baa0ffa648c16f90bfd2c0e342.tar.bz2 otp-22d7ccd9ef7f07baa0ffa648c16f90bfd2c0e342.zip | |
Merge branch 'siri/stdlib/shutdown-Term/OTP-9222' into major
* siri/stdlib/shutdown-Term/OTP-9222:
Handle exit reason {shutdown,Term} as shutdown for children of supervisor
Diffstat (limited to 'lib/stdlib/src/supervisor.erl')
| -rw-r--r-- | lib/stdlib/src/supervisor.erl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/stdlib/src/supervisor.erl b/lib/stdlib/src/supervisor.erl index e60706ed05..023183c5f0 100644 --- a/lib/stdlib/src/supervisor.erl +++ b/lib/stdlib/src/supervisor.erl @@ -661,6 +661,9 @@ do_restart(_, normal, Child, State) -> do_restart(_, shutdown, Child, State) -> NState = state_del_child(Child, State), {ok, NState}; +do_restart(_, {shutdown, _Term}, Child, State) -> + NState = state_del_child(Child, State), + {ok, NState}; do_restart(transient, Reason, Child, State) -> report_error(child_terminated, Reason, Child, State#state.name), restart(Child, State); |