From aade042ed7a485c21481bee2ffaf7652652711a2 Mon Sep 17 00:00:00 2001
From: Emile Joubert <emile@rabbitmq.com>
Date: Thu, 20 Oct 2011 16:22:35 +0100
Subject: Refrain from resetting message expiry in message requeue

---
 src/rabbit_mirror_queue_slave.erl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/rabbit_mirror_queue_slave.erl')

diff --git a/src/rabbit_mirror_queue_slave.erl b/src/rabbit_mirror_queue_slave.erl
index f423760a..7182042d 100644
--- a/src/rabbit_mirror_queue_slave.erl
+++ b/src/rabbit_mirror_queue_slave.erl
@@ -827,14 +827,14 @@ process_instruction({ack, MsgIds},
     [] = MsgIds1 -- MsgIds, %% ASSERTION
     {ok, State #state { msg_id_ack          = MA1,
                         backing_queue_state = BQS1 }};
-process_instruction({requeue, MsgPropsFun, MsgIds},
+process_instruction({requeue, MsgIds},
                     State = #state { backing_queue       = BQ,
                                      backing_queue_state = BQS,
                                      msg_id_ack          = MA }) ->
     {AckTags, MA1} = msg_ids_to_acktags(MsgIds, MA),
     {ok, case length(AckTags) =:= length(MsgIds) of
              true ->
-                 {MsgIds, BQS1} = BQ:requeue(AckTags, MsgPropsFun, BQS),
+                 {MsgIds, BQS1} = BQ:requeue(AckTags, BQS),
                  State #state { msg_id_ack          = MA1,
                                 backing_queue_state = BQS1 };
              false ->
-- 
cgit v1.2.1