Author: rhs
Date: Tue Aug 6 11:04:20 2013
New Revision: 1510900
URL: http://svn.apache.org/r1510900
Log:
PROTON-354: compare trackers using sequence number arithmetic
Modified:
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/TrackerQueue.java
Modified:
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/TrackerQueue.java
URL:
http://svn.apache.org/viewvc/qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/TrackerQueue.java?rev=1510900&r1=1510899&r2=1510900&view=diff
==============================================================================
---
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/TrackerQueue.java
(original)
+++
qpid/proton/trunk/proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/TrackerQueue.java
Tue Aug 6 11:04:20 2013
@@ -163,7 +163,7 @@ class TrackerQueue
private Delivery getDelivery(Tracker tracker)
{
int seq = ((TrackerImpl) tracker).getSequence();
- if (seq < _lwm || seq > _hwm) return null;
+ if ((seq - _lwm) < 0 || (seq - _hwm) > 0) return null;
int index = seq - _lwm;
return index < _deliveries.size() ? _deliveries.get(index) : null;
}
@@ -176,7 +176,7 @@ class TrackerQueue
private void apply(Tracker tracker, int flags, DeliveryOperation operation)
{
int seq = ((TrackerImpl) tracker).getSequence();
- if (seq < _lwm || seq > _hwm) return;
+ if ((seq - _lwm) < 0 || (seq - _hwm) > 0) return;
int last = seq - _lwm;
int start = (flags & Messenger.CUMULATIVE) != 0 ? 0 : last;
for (int i = start; i <= last && i < _deliveries.size(); ++i)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
