summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2013-05-09 16:19:25 +0100
committerSimon MacMullen <simon@rabbitmq.com>2013-05-09 16:19:25 +0100
commit81e8c1903e0e33df4cbe6ddb757331150233d00c (patch)
treee47419fe10421884b437b3574aab7764a6bd0bf9 /src
parent1b6e041ec6f62b3cfcf79fc831e31ab5767fd033 (diff)
parentc56e6463c6c47abbf04fb6b96ed883411e97018c (diff)
downloadrabbitmq-server-git-81e8c1903e0e33df4cbe6ddb757331150233d00c.tar.gz
stable to default
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) ->