aboutsummaryrefslogtreecommitdiffstats
path: root/erts/preloaded
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2016-08-12 11:43:07 +0200
committerLukas Larsson <[email protected]>2016-08-12 11:43:07 +0200
commit2ad936f4e0b123aef8f2f89a97a383fce62cd4b3 (patch)
tree36e9571fc90edb8b15118ae56e1272d6cd66226d /erts/preloaded
parent9cd8c5319a9ffd71fc5f8db755b4014f199fc0f2 (diff)
parent6c41e0910b2ccb12c7a431f4398a7d0213b5b02e (diff)
downloadotp-2ad936f4e0b123aef8f2f89a97a383fce62cd4b3.tar.gz
otp-2ad936f4e0b123aef8f2f89a97a383fce62cd4b3.tar.bz2
otp-2ad936f4e0b123aef8f2f89a97a383fce62cd4b3.zip
Merge branch 'maint'
Diffstat (limited to 'erts/preloaded')
-rw-r--r--erts/preloaded/ebin/init.beambin50048 -> 50036 bytes
-rw-r--r--erts/preloaded/src/init.erl5
2 files changed, 2 insertions, 3 deletions
diff --git a/erts/preloaded/ebin/init.beam b/erts/preloaded/ebin/init.beam
index b856bff4fe..f0344fd6ba 100644
--- a/erts/preloaded/ebin/init.beam
+++ b/erts/preloaded/ebin/init.beam
Binary files differ
diff --git a/erts/preloaded/src/init.erl b/erts/preloaded/src/init.erl
index 45468b3b9c..67929c53c2 100644
--- a/erts/preloaded/src/init.erl
+++ b/erts/preloaded/src/init.erl
@@ -423,9 +423,6 @@ loop(State) ->
Loaded = State#state.loaded, %% boot_loop but is handled here
From ! {init,Loaded}, %% anyway.
loop(State);
- {From, {ensure_loaded, _}} ->
- From ! {init, not_allowed},
- loop(State);
Msg ->
loop(handle_msg(Msg,State))
end.
@@ -465,6 +462,8 @@ do_handle_msg(Msg,State) ->
From ! {init,ok},
{new_state,State#state{subscribed = [Pid|Subscribed]}}
end;
+ {From, {ensure_loaded, _}} ->
+ From ! {init, not_allowed};
X ->
case whereis(user) of
undefined ->