svn commit: r488726 - /incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java

[ritchiem]

Author: ritchiem
Date: Tue Dec 19 09:02:19 2006
New Revision: 488726

URL: http://svn.apache.org/viewvc?view=rev&rev=488726
Log:
QPID-222

ensured that the TXBuffer of a message is set to null when re queuing.

Modified:
    
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java

Modified: 
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
URL: 
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?view=diff&rev=488726&r1=488725&r2=488726
==============================================================================
--- 
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
 (original)
+++ 
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
 Tue Dec 19 09:02:19 2006
@@ -304,7 +304,7 @@
             throw new ConsumerTagNotUniqueException();
         }
 
-        queue.registerProtocolSession(session, _channelId, tag, acks, 
filters,noLocal);
+        queue.registerProtocolSession(session, _channelId, tag, acks, filters, 
noLocal);
         _consumerTag2QueueMap.put(tag, queue);
         return tag;
     }
@@ -382,6 +382,8 @@
         {
             if (unacked.queue != null)
             {
+                unacked.message.setTxnBuffer(null);
+
                 unacked.queue.deliver(unacked.message);
             }
         }