diff options
| author | Martin Ritchie <ritchiem@apache.org> | 2009-02-13 15:09:50 +0000 |
|---|---|---|
| committer | Martin Ritchie <ritchiem@apache.org> | 2009-02-13 15:09:50 +0000 |
| commit | de88120264c214fb78d80700f515be1790660e73 (patch) | |
| tree | 4c23f4fda96e2d75faa345d57072272fba454426 /java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java | |
| parent | 3228a46c865ce9f207d416d1c7483ec26cb1e4f3 (diff) | |
| download | qpid-python-de88120264c214fb78d80700f515be1790660e73.tar.gz | |
QPID-1630 : Updated MessageFactory to be responsible for assigning messagIDs. Several tests needed updating as they relied upon specified messageIDs.
Added a recovery mode to the MessageFactory where by new messages can have their ids specified but only as long as the new id is larger than the last one.
Recovered messages are always persistent.
Simplified a interfaces as a result of not requiring the messageID to be passed through.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@744140 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java')
| -rw-r--r-- | java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java | 8 |
1 files changed, 2 insertions, 6 deletions
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 3b290b3d51..341aae2875 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 @@ -37,7 +37,6 @@ import org.apache.qpid.server.flow.Pre0_10CreditManager; import org.apache.qpid.server.protocol.AMQProtocolSession; import org.apache.qpid.server.queue.AMQQueue; import org.apache.qpid.server.queue.IncomingMessage; -import org.apache.qpid.server.queue.MessageFactory; import org.apache.qpid.server.queue.QueueEntry; import org.apache.qpid.server.queue.UnauthorizedAccessException; import org.apache.qpid.server.queue.AMQMessage; @@ -108,8 +107,6 @@ public class AMQChannel private final List<RequiredDeliveryException> _returnMessages = new LinkedList<RequiredDeliveryException>(); - private MessageFactory _messageHandleFactory = new MessageFactory(); - // Why do we need this reference ? - ritchiem private final AMQProtocolSession _session; private boolean _closing; @@ -153,8 +150,7 @@ public class AMQChannel public void setPublishFrame(MessagePublishInfo info, final Exchange e) throws AMQException { - _currentMessage = new IncomingMessage(_messageStore.getNewMessageId(), info, _txnContext, _session); - _currentMessage.setMessageStore(_messageStore); + _currentMessage = new IncomingMessage(info, _txnContext, _session, _messageStore); _currentMessage.setExchange(e); } @@ -178,7 +174,7 @@ public class AMQChannel routeCurrentMessage(); - _currentMessage.routingComplete(_messageStore, _messageHandleFactory); + _currentMessage.routingComplete(_messageStore); deliverCurrentMessageIfComplete(); |