aboutsummaryrefslogtreecommitdiffstats
path: root/lib/kernel
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-01-03 10:18:56 +0100
committerFredrik Gustafsson <[email protected]>2013-01-03 10:18:56 +0100
commit5ac87d496037b55bd7d0da915e8334f80b382485 (patch)
tree50bd794182bd42277216d711feec93ed2276d624 /lib/kernel
parent1341c1c252ac9f1b244b84c3150c5d6583d2b3b4 (diff)
parentf1237b3e06f85b2ac31e7d923a58e2b906cd91fd (diff)
downloadotp-5ac87d496037b55bd7d0da915e8334f80b382485.tar.gz
otp-5ac87d496037b55bd7d0da915e8334f80b382485.tar.bz2
otp-5ac87d496037b55bd7d0da915e8334f80b382485.zip
Merge branch 'ks/kernel/dist_util-minor-fix/OTP-10662'
* ks/kernel/dist_util-minor-fix/OTP-10662: Do not return wrong terms unnecessarily
Diffstat (limited to 'lib/kernel')
-rw-r--r--lib/kernel/src/dist_util.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/kernel/src/dist_util.erl b/lib/kernel/src/dist_util.erl
index f0d54a2f3e..e3511988a6 100644
--- a/lib/kernel/src/dist_util.erl
+++ b/lib/kernel/src/dist_util.erl
@@ -757,7 +757,8 @@ setup_timer(Pid, Timeout) ->
end.
reset_timer(Timer) ->
- Timer ! {self(), reset}.
+ Timer ! {self(), reset},
+ ok.
cancel_timer(Timer) ->
unlink(Timer),