diff options
| author | Micael Karlberg <[email protected]> | 2012-01-30 14:33:54 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2012-01-30 14:33:54 +0100 |
| commit | a63e3a9bde3e9cac5acee7ca9508da58b2f35591 (patch) | |
| tree | 3ea3dc3e62f1d7975059d5a240895ef85160afc4 /lib/kernel/src/code_server.erl | |
| parent | a0e8f2621a39ca8e032b8ec30164207de1d7c26e (diff) | |
| parent | 18b640a02e5493eb9fe23ae6dc0c38c754f61d0e (diff) | |
| download | otp-a63e3a9bde3e9cac5acee7ca9508da58b2f35591.tar.gz otp-a63e3a9bde3e9cac5acee7ca9508da58b2f35591.tar.bz2 otp-a63e3a9bde3e9cac5acee7ca9508da58b2f35591.zip | |
Merge branch 'master' of super:otp
Diffstat (limited to 'lib/kernel/src/code_server.erl')
| -rw-r--r-- | lib/kernel/src/code_server.erl | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/kernel/src/code_server.erl b/lib/kernel/src/code_server.erl index 32a12e2b52..5d4f2eb70c 100644 --- a/lib/kernel/src/code_server.erl +++ b/lib/kernel/src/code_server.erl @@ -1317,15 +1317,21 @@ int_list([H|T]) when is_integer(H) -> int_list(T); int_list([_|_]) -> false; int_list([]) -> true. +load_file(Mod0, {From,_}=Caller, St0) -> + Mod = to_atom(Mod0), + case pending_on_load(Mod, From, St0) of + no -> load_file_1(Mod, Caller, St0); + {yes,St} -> {noreply,St} + end. -load_file(Mod, Caller, #state{path=Path,cache=no_cache}=St) -> +load_file_1(Mod, Caller, #state{path=Path,cache=no_cache}=St) -> case mod_to_bin(Path, Mod) of error -> {reply,{error,nofile},St}; {Mod,Binary,File} -> try_load_module(File, Mod, Binary, Caller, St) end; -load_file(Mod, Caller, #state{cache=Cache}=St0) -> +load_file_1(Mod, Caller, #state{cache=Cache}=St0) -> Key = {obj,Mod}, case ets:lookup(Cache, Key) of [] -> |