diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2012-11-07 17:53:25 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2012-11-07 17:53:25 +0000 |
| commit | 3720d8d32de65e33d57a4af30965d0650cf245a8 (patch) | |
| tree | f8a1f76a033fde2e56c1c7e798b955d9a6143713 /src | |
| parent | aaba39a9aeb52f0b63a5e76581de8e8516ea117d (diff) | |
| parent | de14a6616da7743104a5258d5b35898b92cdbf6e (diff) | |
| download | rabbitmq-server-git-3720d8d32de65e33d57a4af30965d0650cf245a8.tar.gz | |
merge bug25260 into default
Diffstat (limited to 'src')
| -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 43fe35781d..fb45747866 100644 --- a/src/rabbit_amqqueue_process.erl +++ b/src/rabbit_amqqueue_process.erl @@ -247,9 +247,9 @@ process_args(State = #q{q = #amqqueue{arguments = Arguments}}) -> end end, State, [{<<"x-expires">>, fun init_expires/2}, - {<<"x-message-ttl">>, fun init_ttl/2}, {<<"x-dead-letter-exchange">>, fun init_dlx/2}, - {<<"x-dead-letter-routing-key">>, fun init_dlx_routing_key/2}]). + {<<"x-dead-letter-routing-key">>, fun init_dlx_routing_key/2}, + {<<"x-message-ttl">>, fun init_ttl/2}]). init_expires(Expires, State) -> ensure_expiry_timer(State#q{expires = Expires}). |