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/test/java/org/apache/qpid/server/queue/AckTest.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/test/java/org/apache/qpid/server/queue/AckTest.java')
| -rw-r--r-- | java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java b/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java index cd1ee65c0c..98465eda20 100644 --- a/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java +++ b/java/broker/src/test/java/org/apache/qpid/server/queue/AckTest.java @@ -98,7 +98,7 @@ public class AckTest extends TestCase new LinkedList<RequiredDeliveryException>() ); _queue.registerSubscription(_subscription,false); - MessageFactory factory = new MessageFactory(); + MessageFactory factory = MessageFactory.getInstance(); for (int i = 1; i <= count; i++) { // AMQP version change: Hardwire the version to 0-8 (major=8, minor=0) @@ -106,7 +106,7 @@ public class AckTest extends TestCase MessagePublishInfo publishBody = new MessagePublishInfoImpl(new AMQShortString("someExchange"), false, false, new AMQShortString("rk")); - IncomingMessage msg = new IncomingMessage(_messageStore.getNewMessageId(), publishBody, txnContext,_protocolSession); + IncomingMessage msg = new IncomingMessage(publishBody, txnContext,_protocolSession, _messageStore); //IncomingMessage msg2 = null; if (persistent) { @@ -127,7 +127,7 @@ public class AckTest extends TestCase ArrayList<AMQQueue> qs = new ArrayList<AMQQueue>(); qs.add(_queue); msg.enqueue(qs); - msg.routingComplete(_messageStore, factory); + msg.routingComplete(_messageStore); if(msg.allContentReceived()) { msg.deliverToQueues(); |