diff options
| author | Anders Svensson <[email protected]> | 2013-05-29 18:46:23 +0200 |
|---|---|---|
| committer | Anders Svensson <[email protected]> | 2013-05-29 18:46:23 +0200 |
| commit | 08bc75683f015bf7a542e30eb6ef88b18112fb22 (patch) | |
| tree | b6499f2495b6d26c994e37da7c226cb0634932f1 /lib | |
| parent | cf7078ce68d32638a8add6150ee448f86082e6ee (diff) | |
| parent | 22685099ace9802016bf6203c525702084717d72 (diff) | |
| download | otp-08bc75683f015bf7a542e30eb6ef88b18112fb22.tar.gz otp-08bc75683f015bf7a542e30eb6ef88b18112fb22.tar.bz2 otp-08bc75683f015bf7a542e30eb6ef88b18112fb22.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/diameter/src/base/diameter_watchdog.erl | 4 |
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; |