From f75a6241977e761f96e48a6d7fb0200f7e3cd1f4 Mon Sep 17 00:00:00 2001
From: spring2maz <spring2maz@gmail.com>
Date: Tue, 18 Sep 2018 23:20:40 +0200
Subject: [PATCH] Add a test case to cover timeout message flush in emqx_misc

---
 src/emqx_misc.erl        | 9 ++++-----
 test/emqx_misc_tests.erl | 7 +++++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/emqx_misc.erl b/src/emqx_misc.erl
index c3cec7427..d9e96b9c9 100644
--- a/src/emqx_misc.erl
+++ b/src/emqx_misc.erl
@@ -36,14 +36,13 @@ start_timer(Interval, Dest, Msg) ->
     erlang:start_timer(Interval, Dest, Msg).
 
 -spec(cancel_timer(undefined | reference()) -> ok).
-cancel_timer(undefined) ->
-    ok;
-cancel_timer(Timer) ->
-    case catch erlang:cancel_timer(Timer) of
+cancel_timer(Timer) when is_reference(Timer) ->
+    case erlang:cancel_timer(Timer) of
         false ->
             receive {timeout, Timer, _} -> ok after 0 -> ok end;
         _ -> ok
-    end.
+    end;
+cancel_timer(_) -> ok.
 
 -spec(proc_name(atom(), pos_integer()) -> atom()).
 proc_name(Mod, Id) ->
diff --git a/test/emqx_misc_tests.erl b/test/emqx_misc_tests.erl
index 775887439..a4abac683 100644
--- a/test/emqx_misc_tests.erl
+++ b/test/emqx_misc_tests.erl
@@ -15,6 +15,13 @@
 -module(emqx_misc_tests).
 -include_lib("eunit/include/eunit.hrl").
 
+timer_cancel_flush_test() ->
+    Timer = emqx_misc:start_timer(0, foo),
+    ok = emqx_misc:cancel_timer(Timer),
+    receive {timeout, Timer, foo} -> error(unexpected)
+    after 0 -> ok
+    end.
+
 shutdown_disabled_test() ->
     with_env(
       [{conn_max_msg_queue_len, 0},