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/01/29 14:27:11 UTC
[03/11] qpid-broker-j git commit: QPID-8032: [Broker-J][AMQP 1.0] Fix
defect in coalescing loop
QPID-8032: [Broker-J][AMQP 1.0] Fix defect in coalescing loop
(cherry picked from commit 562714536e68e06c01827a3e9217eb31ce0964ae)
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/ae36d901
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/ae36d901
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/ae36d901
Branch: refs/heads/7.0.x
Commit: ae36d9018e5062e351a1fa5fe47b8d7436d8641c
Parents: 16beefd
Author: Alex Rudyy <or...@apache.org>
Authored: Thu Jan 18 11:06:28 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Mon Jan 29 13:55:51 2018 +0000
----------------------------------------------------------------------
.../server/protocol/v1_0/StandardReceivingLinkEndpoint.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/ae36d901/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
index fe5c4db..bc9dd57 100644
--- a/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
+++ b/broker-plugins/amqp-1-0-protocol/src/main/java/org/apache/qpid/server/protocol/v1_0/StandardReceivingLinkEndpoint.java
@@ -581,17 +581,14 @@ public class StandardReceivingLinkEndpoint extends AbstractReceivingLinkEndpoint
{
disposition = itr.next();
- if (current.isSettled() == disposition.isSettled() &&
- Objects.equals(current.getResultantState(), disposition.getResultantState()))
- {
- deliveryTags.add(disposition.getDeliveryTag());
- }
- else
+ if (current.isSettled() != disposition.isSettled() ||
+ !Objects.equals(current.getResultantState(), disposition.getResultantState()))
{
updateDispositions(deliveryTags, current.getResultantState(), current.isSettled());
deliveryTags.clear();
current = disposition;
}
+ deliveryTags.add(disposition.getDeliveryTag());
}
if (!deliveryTags.isEmpty())
{
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org