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 2021/06/15 08:20:41 UTC
[qpid-broker-j] branch main updated (9b396b4 -> 3f44105)
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git.
from 9b396b4 QPID-8520: [Broker-J] Remove Qpid port-unification support for Jetty
new e561dcd QPID-8523:[Broker-J] Set initial-delivery-count in a response attach when destination is not found
new 3f44105 QPID-8523:[Broker-J] Set initial-delivery-count in a response attach only when role is a sender
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java | 4 ++++
.../apache/qpid/tests/protocol/v1_0/transport/link/AttachTest.java | 1 +
2 files changed, 5 insertions(+)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 02/02: QPID-8523:[Broker-J] Set
initial-delivery-count in a response attach only when role is a sender
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit 3f44105f80ac52e493d028c0cc43d861c55add62
Author: Alex Rudyy <or...@apache.org>
AuthorDate: Tue Jun 15 09:20:23 2021 +0100
QPID-8523:[Broker-J] Set initial-delivery-count in a response attach only when role is a sender
---
.../org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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 @@ public class ErrantLinkEndpoint<S extends BaseSource, T extends BaseTarget> impl
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);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[qpid-broker-j] 01/02: QPID-8523:[Broker-J] Set
initial-delivery-count in a response attach when destination is not found
Posted by or...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
orudyy pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-broker-j.git
commit e561dcdd236e8d30de2e2138831798512776bfce
Author: Dedeepya T <de...@yahoo.co.in>
AuthorDate: Mon Jun 14 18:43:20 2021 +0530
QPID-8523:[Broker-J] Set initial-delivery-count in a response attach when destination is not found
This closes #92
---
.../java/org/apache/qpid/server/protocol/v1_0/ErrantLinkEndpoint.java | 1 +
.../org/apache/qpid/tests/protocol/v1_0/transport/link/AttachTest.java | 1 +
2 files changed, 2 insertions(+)
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 1bd9604..a12198e 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,6 +90,7 @@ public class ErrantLinkEndpoint<S extends BaseSource, T extends BaseTarget> impl
attachToSend.setName(_link.getName());
attachToSend.setRole(getRole());
attachToSend.setHandle(getLocalHandle());
+ attachToSend.setInitialDeliveryCount(UnsignedInteger.ZERO);
attachToSend.setSource(getSource());
attachToSend.setTarget(getTarget());
_session.sendAttach(attachToSend);
diff --git a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/AttachTest.java b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/AttachTest.java
index cac9ecd..5aa0b37 100644
--- a/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/AttachTest.java
+++ b/systests/protocol-tests-amqp-1-0/src/test/java/org/apache/qpid/tests/protocol/v1_0/transport/link/AttachTest.java
@@ -150,6 +150,7 @@ public class AttachTest extends BrokerAdminUsingTestBase
assertThat(responseAttach.getName(), is(notNullValue()));
assertThat(responseAttach.getHandle().longValue(), is(both(greaterThanOrEqualTo(0L)).and(lessThan(UnsignedInteger.MAX_VALUE.longValue()))));
assertThat(responseAttach.getRole(), is(Role.SENDER));
+ assertThat(responseAttach.getInitialDeliveryCount(), is((UnsignedInteger.ZERO)));
assertThat(responseAttach.getSource(), is(nullValue()));
assertThat(responseAttach.getTarget(), is(nullValue()));
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org