diff options
| author | Erlang/OTP <[email protected]> | 2009-12-14 13:03:38 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2009-12-14 13:03:38 +0000 |
| commit | 1540714225f1d224ebeac73c711d673984edcf51 (patch) | |
| tree | 01fe9e9d01700b815614a048a2a79efed6ec1ac2 /erts | |
| parent | 47b882a585b5a226bd00b5125bac948ba9268c7f (diff) | |
| parent | 1fe894432615e35f4ecbe3a33f8ba2ded21f8096 (diff) | |
| download | otp-1540714225f1d224ebeac73c711d673984edcf51.tar.gz otp-1540714225f1d224ebeac73c711d673984edcf51.tar.bz2 otp-1540714225f1d224ebeac73c711d673984edcf51.zip | |
Merge branch 'bg/on_load' into ccase/r13b04_dev
* bg/on_load:
Test on_load functions that don't return 'ok'
Change the expected return value for on_load functions
OTP-8339 The expected return value for an on_load function has been
changed. (See the section about code loading in the Reference
manual.)
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/preloaded/ebin/init.beam | bin | 44460 -> 44460 bytes | |||
| -rw-r--r-- | erts/preloaded/src/init.erl | 5 |
2 files changed, 1 insertions, 4 deletions
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam Binary files differindex 7b6bafd1af..be1f71e6c5 100644 --- a/erts/preloaded/ebin/init.beam +++ b/erts/preloaded/ebin/init.beam diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl index c6f4c62f63..c0b3d286e8 100644 --- a/erts/preloaded/src/init.erl +++ b/erts/preloaded/src/init.erl @@ -1357,10 +1357,7 @@ run_on_load_handlers([M|Ms]) -> {Pid,Ref} = spawn_monitor(Fun), receive {'DOWN',Ref,process,Pid,OnLoadRes} -> - Keep = if - is_boolean(OnLoadRes) -> OnLoadRes; - true -> false - end, + Keep = OnLoadRes =:= ok, erlang:finish_after_on_load(M, Keep), case Keep of false -> |