diff options
| author | Peter Andersson <[email protected]> | 2012-08-10 11:41:38 +0200 |
|---|---|---|
| committer | Peter Andersson <[email protected]> | 2012-08-10 11:41:38 +0200 |
| commit | 4b70df67d825c1b44ca15a5a4ecd57ad1828ead3 (patch) | |
| tree | cd31772649b8f1e599e7fbe2cf7b76b1c2dc7a7b /lib/stdlib/src/gen_server.erl | |
| parent | c075ac6484e3d5a93a0d870ab4483d39ae26eaec (diff) | |
| parent | f968ff87b1d6fb74237010bffa0390953337425e (diff) | |
| download | otp-4b70df67d825c1b44ca15a5a4ecd57ad1828ead3.tar.gz otp-4b70df67d825c1b44ca15a5a4ecd57ad1828ead3.tar.bz2 otp-4b70df67d825c1b44ca15a5a4ecd57ad1828ead3.zip | |
Merge remote branch 'upstream/maint' into maint
Diffstat (limited to 'lib/stdlib/src/gen_server.erl')
| -rw-r--r-- | lib/stdlib/src/gen_server.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl index 59c6d240ba..04308a51b7 100644 --- a/lib/stdlib/src/gen_server.erl +++ b/lib/stdlib/src/gen_server.erl @@ -270,7 +270,7 @@ enter_loop(Mod, Options, State) -> enter_loop(Mod, Options, State, self(), infinity). enter_loop(Mod, Options, State, ServerName = {Scope, _}) - when Scope == local; Scope == local -> + when Scope == local; Scope == global -> enter_loop(Mod, Options, State, ServerName, infinity); enter_loop(Mod, Options, State, ServerName = {via, _, _}) -> |