commit 3f44105f80ac52e493d028c0cc43d861c55add62
author Alex Rudyy <orudyy@apache.org> Tue Jun 15 09:20:23 2021 +0100
committer Alex Rudyy <orudyy@apache.org> Tue Jun 15 09:20:23 2021 +0100
tree 4a49f1a16b78c6c1d305151086495cdbd3a11af8
parent e561dcdd236e8d30de2e2138831798512776bfce

QPID-8523:[Broker-J] Set initial-delivery-count in a response attach only when role is a sender

broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java

diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java
index a12198e..42d756a 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java
@@ -90,7 +90,10 @@
         attachToSend.setName(_link.getName());
         attachToSend.setRole(getRole());
         attachToSend.setHandle(getLocalHandle());
-        attachToSend.setInitialDeliveryCount(UnsignedInteger.ZERO);
+        if (getRole() == Role.SENDER)
+        {
+            attachToSend.setInitialDeliveryCount(UnsignedInteger.ZERO);
+        }
         attachToSend.setSource(getSource());
         attachToSend.setTarget(getTarget());
         _session.sendAttach(attachToSend);