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/kernel/src/rpc.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/kernel/src/rpc.erl')
-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); |