diff options
| author | Björn-Egil Dahlberg <[email protected]> | 2016-05-13 13:28:49 +0200 |
|---|---|---|
| committer | Björn-Egil Dahlberg <[email protected]> | 2016-05-13 13:28:49 +0200 |
| commit | bab87d0bf1dc89953caec354648c6c8db8737e92 (patch) | |
| tree | 6d7479763672b8e4a7177bb04dec0f1eb123a6a0 /lib/runtime_tools/src/appmon_info.erl | |
| parent | 9addbee447442a08430557c20d24c961df224926 (diff) | |
| parent | 5f312eab94a4477a36637f9594ae6da9b8b2a6aa (diff) | |
| download | otp-bab87d0bf1dc89953caec354648c6c8db8737e92.tar.gz otp-bab87d0bf1dc89953caec354648c6c8db8737e92.tar.bz2 otp-bab87d0bf1dc89953caec354648c6c8db8737e92.zip | |
Merge branch 'egil/runtime_tools/fix-unmatched_return/OTP-13595'
* egil/runtime_tools/fix-unmatched_return/OTP-13595:
runtime_tools: Fix unmatched return warnings
Diffstat (limited to 'lib/runtime_tools/src/appmon_info.erl')
| -rw-r--r-- | lib/runtime_tools/src/appmon_info.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/runtime_tools/src/appmon_info.erl b/lib/runtime_tools/src/appmon_info.erl index fead724373..b5500085a3 100644 --- a/lib/runtime_tools/src/appmon_info.erl +++ b/lib/runtime_tools/src/appmon_info.erl @@ -307,9 +307,10 @@ do_work(Key, State) -> {Cmd, Aux, From, _OldRef, Old, Opts} = retrieve(WorkStore, Key), {ok, Result} = do_work2(Cmd, Aux, From, Old, Opts), if - Result==Old -> ok; - true -> - From ! {delivery, self(), Cmd, Aux, Result} + Result==Old -> ok; + true -> + From ! {delivery, self(), Cmd, Aux, Result}, + ok end, case get_opt(timeout, Opts) of at_most_once -> @@ -393,7 +394,7 @@ del_task(Key, WorkStore) -> {_Cmd, _Aux, _From, Ref, _Old, Opts} -> if Ref /= nil -> - timer:cancel(Ref), + {ok,_} = timer:cancel(Ref), receive {do_it, Key} -> Opts |