diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2013-02-20 19:59:45 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2013-02-20 19:59:45 +0000 |
| commit | d1fadba8c2da7cdc90133d458a1f474ed2b77720 (patch) | |
| tree | 30b62ead8f7942f5085f14f8cf83e22652e316fd | |
| parent | 08caf176e4b073894ee65a9c8cc65116661d75f9 (diff) | |
| parent | 5278b6354ad6d3cc3dd59abe5afdd5a36ed96d2b (diff) | |
| download | rabbitmq-server-git-d1fadba8c2da7cdc90133d458a1f474ed2b77720.tar.gz | |
merge default into bug23749
| -rw-r--r-- | src/rabbit_amqqueue_process.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl index c0e74129d6..830ad35be4 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -775,8 +775,8 @@ drop_expired_msgs(Now, State = #q{backing_queue_state = BQS, fun () -> {Next, BQS1} = BQ:dropwhile(ExpirePred, BQS), {Next, State#q{backing_queue_state = BQS1}} end), ensure_ttl_timer(case Props of - undefined -> undefined; - #message_properties{expiry = Exp} -> Exp + undefined -> undefined; + #message_properties{expiry = Exp} -> Exp end, State1). with_dlx(undefined, _With, Without) -> Without(); |