diff options
| author | Hans Bolinder <[email protected]> | 2013-05-06 12:16:38 +0200 |
|---|---|---|
| committer | Hans Bolinder <[email protected]> | 2013-05-06 12:16:38 +0200 |
| commit | 551d92fead40277f2152a7351ed6ab19b623b16b (patch) | |
| tree | 7812afb9446ff1c7a8596a266a1cbd81eacc5f96 /lib/kernel/src/global.erl | |
| parent | 0dc5a00011d1d24b68c9d43ff608415f84c50499 (diff) | |
| parent | 2324dec9fb37e301413c74acf1dce8ae3c29fc48 (diff) | |
| download | otp-551d92fead40277f2152a7351ed6ab19b623b16b.tar.gz otp-551d92fead40277f2152a7351ed6ab19b623b16b.tar.bz2 otp-551d92fead40277f2152a7351ed6ab19b623b16b.zip | |
Merge branch 'hb/unmatched_returns/OTP-10908'
* hb/unmatched_returns/OTP-10908:
Fix unmatched_returns warnings in Kernel
Fix a minor bug in ets:tabfile_info() and ets:file2tab()
Fix unmatched_returns warning in Kernel
Fix unmatched_return warnings in sasl
Fix unmatched_return warnings in kernel
Fix unmatched_return warning in erl_prim_loader
Fix unmatched_return warnings in stdlib
Fix unmatched_returns warnings in STDLIB and Kernel
Diffstat (limited to 'lib/kernel/src/global.erl')
| -rw-r--r-- | lib/kernel/src/global.erl | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/kernel/src/global.erl b/lib/kernel/src/global.erl index b24a9d5eac..ef878b8d0c 100644 --- a/lib/kernel/src/global.erl +++ b/lib/kernel/src/global.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 1996-2012. All Rights Reserved. +%% Copyright Ericsson AB 1996-2013. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -2069,7 +2069,8 @@ random_sleep(Times) -> case get(random_seed) of undefined -> {A1, A2, A3} = now(), - random:seed(A1, A2, A3 + erlang:phash(node(), 100000)); + _ = random:seed(A1, A2, A3 + erlang:phash(node(), 100000)), + ok; _ -> ok end, %% First time 1/4 seconds, then doubling each time up to 8 seconds max. |