You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2018/03/21 12:42:43 UTC

qpid-broker-j git commit: QPID-7948: [Broker-J] [AMQP 0-9-1] [Publisher Confirms] Ensure that unroutable non-mandatory messages are acknowledged

Repository: qpid-broker-j
Updated Branches:
  refs/heads/7.0.x b5d67e003 -> aea2d43c5


QPID-7948: [Broker-J] [AMQP 0-9-1] [Publisher Confirms] Ensure that unroutable non-mandatory messages are acknowledged

(cherry picked from commit fb98e76e86656799a9e16e6f09a6402b01bd2f2a)


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/aea2d43c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/aea2d43c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/aea2d43c

Branch: refs/heads/7.0.x
Commit: aea2d43c5ed6ab921b1b3eefe43ece96125c9d5b
Parents: b5d67e0
Author: Keith Wall <kw...@apache.org>
Authored: Mon Jan 15 16:42:16 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Wed Mar 21 12:40:51 2018 +0000

----------------------------------------------------------------------
 .../java/org/apache/qpid/server/protocol/v0_8/AMQChannel.java  | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/aea2d43c/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 ffe2c8d..6418ea9 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
@@ -461,6 +461,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));
                                 }
                             }


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org