aboutsummaryrefslogtreecommitdiffstats
path: root/lib/diameter
diff options
context:
space:
mode:
authorAnders Svensson <anders@erlang.org>2013-05-29 18:46:10 +0200
committerAnders Svensson <anders@erlang.org>2013-05-29 18:46:10 +0200
commit22685099ace9802016bf6203c525702084717d72 (patch)
treee0ddaf418777aaf3ba472572a5d864500406f6f8 /lib/diameter
parent811ecaa471eeff3bd5b9950a1a1baf1dcc83c54b (diff)
parent1229133ff6600492bcc2f5e94800b795eec9e95f (diff)
downloadotp-22685099ace9802016bf6203c525702084717d72.tar.gz
otp-22685099ace9802016bf6203c525702084717d72.tar.bz2
otp-22685099ace9802016bf6203c525702084717d72.zip
Merge branch 'anders/diameter/watchdog_function_clause/OTP-11115' into maint
* anders/diameter/watchdog_function_clause/OTP-11115: Fix watchdog function_clause
Diffstat (limited to 'lib/diameter')
-rw-r--r--lib/diameter/src/base/diameter_watchdog.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/diameter/src/base/diameter_watchdog.erl b/lib/diameter/src/base/diameter_watchdog.erl
index 41c493ff20..88ccf630e2 100644
--- a/lib/diameter/src/base/diameter_watchdog.erl
+++ b/lib/diameter/src/base/diameter_watchdog.erl
@@ -505,7 +505,9 @@ set_watchdog(#watchdog{tw = TwInit,
tref = TRef}
= S) ->
cancel(TRef),
- S#watchdog{tref = erlang:start_timer(tw(TwInit), self(), tw)}.
+ S#watchdog{tref = erlang:start_timer(tw(TwInit), self(), tw)};
+set_watchdog(stop = No) ->
+ No.
cancel(undefined) ->
ok;