summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEmile Joubert <emile@rabbitmq.com>2013-05-09 17:23:16 +0100
committerEmile Joubert <emile@rabbitmq.com>2013-05-09 17:23:16 +0100
commit48cf514c121fd0adfc536709712a0bf2c4e44b09 (patch)
tree46a1ff54f071aa03f10f97def68ffbca476bfd1d /src
parente495b62dffe7c4a6503accc516c7360ca0094585 (diff)
parentc56e6463c6c47abbf04fb6b96ed883411e97018c (diff)
downloadrabbitmq-server-git-48cf514c121fd0adfc536709712a0bf2c4e44b09.tar.gz
Merged bug25545 into stable
Diffstat (limited to 'src')
-rw-r--r--src/rabbit_amqqueue_process.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 066392f81c..d2f4a178d5 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -1356,7 +1356,7 @@ handle_cast(wake_up, State) ->
handle_info(maybe_expire, State) ->
case is_unused(State) of
true -> stop(State);
- false -> noreply(ensure_expiry_timer(State))
+ false -> noreply(State#q{expiry_timer_ref = undefined})
end;
handle_info(drop_expired, State) ->