From 42ab766223b519da2b68229698b85e5d8a09d7ce Mon Sep 17 00:00:00 2001
From: Alexandru Scvortov <alexandru@rabbitmq.com>
Date: Fri, 14 Jan 2011 13:20:23 +0000
Subject: Matthew's patch: don't add requeue'd messages to unconfirmed

---
 src/rabbit_variable_queue.erl | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index 665cac96..35e37df6 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -710,10 +710,14 @@ tx_commit(Txn, Fun, MsgPropsFun,
        end)}.
 
 requeue(AckTags, MsgPropsFun, State) ->
+    MsgPropsFun1 = fun (MsgProps) ->
+                           (MsgPropsFun(MsgProps)) #message_properties {
+                             needs_confirming = false }
+                   end,
     a(reduce_memory_use(
         ack(fun msg_store_release/3,
             fun (#msg_status { msg = Msg, msg_props = MsgProps }, State1) ->
-                    {_SeqId, State2} = publish(Msg, MsgPropsFun(MsgProps),
+                    {_SeqId, State2} = publish(Msg, MsgPropsFun1(MsgProps),
                                                true, false, State1),
                     State2;
                 ({IsPersistent, Guid, MsgProps}, State1) ->
@@ -721,7 +725,7 @@ requeue(AckTags, MsgPropsFun, State) ->
                     {{ok, Msg = #basic_message{}}, MSCState1} =
                         msg_store_read(MSCState, IsPersistent, Guid),
                     State2 = State1 #vqstate { msg_store_clients = MSCState1 },
-                    {_SeqId, State3} = publish(Msg, MsgPropsFun(MsgProps),
+                    {_SeqId, State3} = publish(Msg, MsgPropsFun1(MsgProps),
                                                true, true, State2),
                     State3
             end,
-- 
cgit v1.2.1