diff options
| author | Björn Gustavsson <[email protected]> | 2016-02-01 12:21:07 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2016-02-01 12:21:07 +0100 |
| commit | 6c574b52d66a6c74f7413fd19c1b99564aef293e (patch) | |
| tree | 7f2a2300184e62f3c2b701d2837b0fa6af6f4a30 /lib | |
| parent | 664a77398df34ce17a00d43ab0277a6409a43c36 (diff) | |
| parent | 5dac3400b00e499cb7c436b6b71c510c718d92cf (diff) | |
| download | otp-6c574b52d66a6c74f7413fd19c1b99564aef293e.tar.gz otp-6c574b52d66a6c74f7413fd19c1b99564aef293e.tar.bz2 otp-6c574b52d66a6c74f7413fd19c1b99564aef293e.zip | |
Merge branch 'maint'
* maint:
Check for already started beam_lib crypto server
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdlib/src/beam_lib.erl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/stdlib/src/beam_lib.erl b/lib/stdlib/src/beam_lib.erl index 6e00401dce..d20d86269a 100644 --- a/lib/stdlib/src/beam_lib.erl +++ b/lib/stdlib/src/beam_lib.erl @@ -931,7 +931,10 @@ call_crypto_server(Req) -> end. call_crypto_server_1(Req) -> - {ok, _} = gen_server:start({local,?CRYPTO_KEY_SERVER}, ?MODULE, [], []), + case gen_server:start({local,?CRYPTO_KEY_SERVER}, ?MODULE, [], []) of + {ok, _} -> ok; + {error, {already_started, _}} -> ok + end, erlang:yield(), call_crypto_server(Req). |