summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2014-05-30 12:12:01 +0100
committerSimon MacMullen <simon@rabbitmq.com>2014-05-30 12:12:01 +0100
commit124d7834fa54d0cc66f6e45750511db8fe3dee22 (patch)
tree076425eba932c22452fcea93f651bf7bcec0b249
parent6c8f0d41197df54b6e521048207ca53e8456ef05 (diff)
downloadrabbitmq-server-bug26204.tar.gz
I think we've determined that we don't need that check.bug26204
-rw-r--r--src/rabbit_misc.erl6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index 31648372..5f23caf8 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -1050,10 +1050,8 @@ ensure_timer(State, Idx, After, Msg) ->
stop_timer(State, Idx) ->
case element(Idx, State) of
undefined -> State;
- TRef -> case cancel_timer(TRef) of %% TODO bug 25393 comment 3
- false -> State;
- _ -> setelement(Idx, State, undefined)
- end
+ TRef -> cancel_timer(TRef),
+ setelement(Idx, State, undefined)
end.
%% timer:send_after/3 goes through a single timer process but allows