diff options
| author | Henrik Nord <[email protected]> | 2012-07-18 11:01:05 +0200 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2012-07-18 11:01:07 +0200 |
| commit | d946588dbf7c84b69f85947237ac6ca64c8560ad (patch) | |
| tree | 02586db9f8f02f53dab47ba7257b32877bd4b921 /lib/kernel/src | |
| parent | 3ad520ad95e79fe5dc63f017f37f043e5a84e3e8 (diff) | |
| parent | b991b99f9a7cf875786c7e96970c7aff37c9a6e7 (diff) | |
| download | otp-d946588dbf7c84b69f85947237ac6ca64c8560ad.tar.gz otp-d946588dbf7c84b69f85947237ac6ca64c8560ad.tar.bz2 otp-d946588dbf7c84b69f85947237ac6ca64c8560ad.zip | |
Merge branch 'tc/rpc-call-fix' into maint
* tc/rpc-call-fix:
Fix rpc:call/5 for local calls with a finite Timeout
OTP-10149
Diffstat (limited to 'lib/kernel/src')
| -rw-r--r-- | lib/kernel/src/rpc.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kernel/src/rpc.erl b/lib/kernel/src/rpc.erl index e214ffa404..a3fc57a124 100644 --- a/lib/kernel/src/rpc.erl +++ b/lib/kernel/src/rpc.erl @@ -286,7 +286,7 @@ call(N,M,F,A) -> Reason :: term(), Timeout :: timeout(). -call(N,M,F,A,_Timeout) when node() =:= N -> %% Optimize local call +call(N,M,F,A,infinity) when node() =:= N -> %% Optimize local call local_call(M,F,A); call(N,M,F,A,infinity) -> do_call(N, {call,M,F,A,group_leader()}, infinity); |