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/test/supervisor_1.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/test/supervisor_1.erl')
| -rw-r--r-- | lib/stdlib/test/supervisor_1.erl | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/stdlib/test/supervisor_1.erl b/lib/stdlib/test/supervisor_1.erl index 3198be0fed..f819594c46 100644 --- a/lib/stdlib/test/supervisor_1.erl +++ b/lib/stdlib/test/supervisor_1.erl @@ -62,6 +62,12 @@ handle_info(die, State) -> handle_info(stop, State) -> {stop, normal, State}; +handle_info({'EXIT',_,shutdown}, State) -> + {stop, shutdown, State}; + +handle_info({'EXIT',_,{shutdown,Term}}, State) -> + {stop, {shutdown,Term}, State}; + handle_info({sleep, Time}, State) -> io:format("FOO: ~p~n", [Time]), timer:sleep(Time), |