diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2012-01-21 00:06:40 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2012-01-21 00:06:40 +0000 |
| commit | 8bce3305776bbfbe5b80fdf1a6120c30a89b1552 (patch) | |
| tree | 47df1232cf4bf1c21305cac64fc3e9a2410f0602 /qpid/java/systests | |
| parent | e57c95e7bb3b66961fedec5b6021d3326c468cf5 (diff) | |
| download | qpid-python-8bce3305776bbfbe5b80fdf1a6120c30a89b1552.tar.gz | |
QPID-3774 : allow out of order completion of persistent enqueues / dequeues (0-9 codepath)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1234215 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests')
2 files changed, 4 insertions, 3 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java index 7f578a6389..a258e4267d 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java @@ -224,13 +224,13 @@ public class ManagedConnectionMBeanTest extends QpidBrokerTestCase mBean.rollbackTransactions(channelId.intValue()); Message m = consumer.receive(1000l); - assertNull("Unexpected message received", m); + assertNull("Unexpected message received: " + String.valueOf(m), m); producerSession.commit(); _connection.start(); m = consumer.receive(1000l); - assertNull("Unexpected message received", m); + assertNull("Unexpected message received after commit " + String.valueOf(m), m); } public void testAuthorisedId() throws Exception diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java index ec96f778f6..07faf1ef3e 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ExchangeLoggingTest.java @@ -31,6 +31,7 @@ import javax.jms.Session; import javax.jms.TextMessage; import org.apache.qpid.client.AMQConnection; +import org.apache.qpid.client.AMQSession; import org.apache.qpid.client.AMQSession_0_10; import org.apache.qpid.framing.AMQFrame; import org.apache.qpid.framing.AMQShortString; @@ -195,7 +196,7 @@ public class ExchangeLoggingTest extends AbstractTestLogging ExchangeDeleteBody body = registry.createExchangeDeleteBody(0, new AMQShortString(_name), false, true); - AMQFrame exchangeDeclare = body.generateFrame(0); + AMQFrame exchangeDeclare = body.generateFrame(((AMQSession)_session).getChannelId()); ((AMQConnection) _connection).getProtocolHandler().syncWrite(exchangeDeclare, ExchangeDeleteOkBody.class); } |