diff options
| author | Gustav Simonsson <[email protected]> | 2012-07-10 10:34:02 +0200 |
|---|---|---|
| committer | Gustav Simonsson <[email protected]> | 2012-07-10 10:34:02 +0200 |
| commit | eac9c3494ce4d684b09779f075317e8943a7928b (patch) | |
| tree | 4e96c7aed2eb09cf20acd6e340616cedc0e87754 /lib/stdlib/src/gen_server.erl | |
| parent | c075ac6484e3d5a93a0d870ab4483d39ae26eaec (diff) | |
| parent | 30fe2fcfd7116959f97d62301b1e95b6c4635be7 (diff) | |
| download | otp-eac9c3494ce4d684b09779f075317e8943a7928b.tar.gz otp-eac9c3494ce4d684b09779f075317e8943a7928b.tar.bz2 otp-eac9c3494ce4d684b09779f075317e8943a7928b.zip | |
Merge branch 'gustav/stdlib/gen_server_enter_loop_global_scope/OTP-10130' into maint
* gustav/stdlib/gen_server_enter_loop_global_scope/OTP-10130:
Change testcase of gen_server:enter_loop/4 with global scope to match on result of a gen_server:call/2
Correct guard matching in gen_server:enter_loop/4 to match global scope in ServerName without timeout.
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, _, _}) -> |