You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2018/01/16 13:17:23 UTC
[2/3] qpid-broker-j git commit: QPID-7948: [Broker-J] [AMQP 0-9-1]
[Publisher Confirms] Ensure that unroutable non-mandatory messages are
acknowledged
QPID-7948: [Broker-J] [AMQP 0-9-1] [Publisher Confirms] Ensure that unroutable non-mandatory messages are acknowledged
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/fb98e76e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/fb98e76e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/fb98e76e
Branch: refs/heads/master
Commit: fb98e76e86656799a9e16e6f09a6402b01bd2f2a
Parents: f03f718
Author: Keith Wall <kw...@apache.org>
Authored: Mon Jan 15 16:42:16 2018 +0000
Committer: Keith Wall <kw...@apache.org>
Committed: Tue Jan 16 13:13:47 2018 +0000
----------------------------------------------------------------------
.../java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java | 6 ++++++
.../v0_8/extension/confirms/PublisherConfirmsTest.java | 4 +++-
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fb98e76e/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
index 2c4e88a..34571cf 100644
--- a/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
+++ b/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java
@@ -475,6 +475,12 @@ public class AMQChannel extends AbstractAMQPSession<AMQChannel, ConsumerTarget_0
}
else
{
+ if (_confirmOnPublish)
+ {
+ _connection.writeFrame(new AMQFrame(_channelId,
+ new BasicAckBody(_confirmedMessageCounter,
+ false)));
+ }
message(ExchangeMessages.DISCARDMSG(exchangeName, routingKey));
}
}
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/fb98e76e/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/confirms/PublisherConfirmsTest.java
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/confirms/PublisherConfirmsTest.java b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/confirms/PublisherConfirmsTest.java
index be2d444..e582db9 100644
--- a/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/confirms/PublisherConfirmsTest.java
+++ b/systests/protocol-tests-amqp-0-8/src/test/java/org/apache/qpid/tests/protocol/v0_8/extension/confirms/PublisherConfirmsTest.java
@@ -111,7 +111,9 @@ public class PublisherConfirmsTest extends BrokerAdminUsingTestBase
}
@Test
- @Ignore("QPID-7948 unrouteable message sent without mandatory true is neither ack'd nor nack'd")
+ @SpecificationTest(section = "https://www.rabbitmq.com/confirms.html",
+ description = "After a channel is put into confirm mode, all subsequently published messages will be "
+ + "confirmed or nack'd once")
public void publishUnrouteableMessage() throws Exception
{
try(FrameTransport transport = new FrameTransport(_brokerAddress).connect())
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org