summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-01-16 10:55:59 +0000
committerSimon MacMullen <simon@rabbitmq.com>2013-01-16 10:55:59 +0000
commit7fca26b8cf85bac3270b676d2ebbedd2079501c6 (patch)
treed4fcd27719f4a8fe7aad050024edaa5f11197f2d
parent569d2d42f5c9954641b05ba22bcb7155600529d1 (diff)
downloadrabbitmq-server-git-7fca26b8cf85bac3270b676d2ebbedd2079501c6.tar.gz
...and do the same thing here.
-rw-r--r--src/rabbit_event.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/rabbit_event.erl b/src/rabbit_event.erl
index 7d91b6fa2b..2d626ad4bf 100644
--- a/src/rabbit_event.erl
+++ b/src/rabbit_event.erl
@@ -112,8 +112,10 @@ stop_stats_timer(C, P) ->
case element(P, C) of
#state{level = Level, timer = TRef} = State
when Level =/= none andalso TRef =/= undefined ->
- erlang:cancel_timer(TRef),
- setelement(P, C, State#state{timer = undefined});
+ case erlang:cancel_timer(TRef) of
+ false -> C;
+ _ -> setelement(P, C, State#state{timer = undefined})
+ end;
#state{} ->
C
end.