From 7edf1cc45ee35542df2ba4e3ebd2bc4d9e9dd9b9 Mon Sep 17 00:00:00 2001 From: Martin Ritchie Date: Tue, 19 Dec 2006 17:02:19 +0000 Subject: QPID-222 ensured that the TXBuffer of a message is set to null when re queuing. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@488726 13f79535-47bb-0310-9956-ffa450edef68 --- java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'java') diff --git a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java index 117231b36e..3081181c80 100644 --- a/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java +++ b/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java @@ -304,7 +304,7 @@ public class AMQChannel 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 @@ public class AMQChannel { if (unacked.queue != null) { + unacked.message.setTxnBuffer(null); + unacked.queue.deliver(unacked.message); } } -- cgit v1.2.1