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/18 11:07:07 UTC
qpid-broker-j git commit: QPID-8032: [Broker-J][AMQP 1.0] Fix defect
in coalescing loop
Repository: qpid-broker-j
Updated Branches:
refs/heads/master 1ddcfa09a -> 562714536
QPID-8032: [Broker-J][AMQP 1.0] Fix defect in coalescing loop
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/56271453
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/56271453
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/56271453
Branch: refs/heads/master
Commit: 562714536e68e06c01827a3e9217eb31ce0964ae
Parents: 1ddcfa0
Author: Alex Rudyy <or...@apache.org>
Authored: Thu Jan 18 11:06:28 2018 +0000
Committer: Alex Rudyy <or...@apache.org>
Committed: Thu Jan 18 11:06:46 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/56271453/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 d6518b6..a36a276 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
@@ -572,17 +572,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