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
commit88c37f00b352a8720190ad33efde29d5db165be3 (patch)
treed4fcd27719f4a8fe7aad050024edaa5f11197f2d
parent0e929121c541ca467d9a30cc48b981b5f61ca997 (diff)
downloadrabbitmq-server-bug25393.tar.gz
...and do the same thing here.bug25393
-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 7d91b6fa..2d626ad4 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.