diff options
author | Rafael H. Schloming <rhs@apache.org> | 2008-06-13 13:47:21 +0000 |
---|---|---|
committer | Rafael H. Schloming <rhs@apache.org> | 2008-06-13 13:47:21 +0000 |
commit | 14f077f9b0e927eecaae295a513719f86a40b09a (patch) | |
tree | 9fb1176db28e50ee52c472c2c928c15ce880ee95 | |
parent | d3d95a88c8f428dc87a2cf42966768a9e45cccbb (diff) | |
download | qpid-python-14f077f9b0e927eecaae295a513719f86a40b09a.tar.gz |
QPID-901: don't send known-completed for ranges we ignore
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@667540 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | java/common/src/main/java/org/apache/qpidity/transport/Session.java | 6 | ||||
-rw-r--r-- | java/common/src/main/java/org/apache/qpidity/transport/SessionDelegate.java | 17 |
2 files changed, 18 insertions, 5 deletions
diff --git a/java/common/src/main/java/org/apache/qpidity/transport/Session.java b/java/common/src/main/java/org/apache/qpidity/transport/Session.java index e0bdcf789e..331e1517d1 100644 --- a/java/common/src/main/java/org/apache/qpidity/transport/Session.java +++ b/java/common/src/main/java/org/apache/qpidity/transport/Session.java @@ -226,11 +226,12 @@ public class Session extends Invoker } } - void complete(int lower, int upper) + boolean complete(int lower, int upper) { log.debug("%s complete(%d, %d)", this, lower, upper); synchronized (commands) { + int old = maxComplete; for (int id = max(maxComplete, lower); le(id, upper); id++) { commands.remove(id); @@ -239,8 +240,9 @@ public class Session extends Invoker { maxComplete = max(maxComplete, upper); } - commands.notifyAll(); log.debug("%s commands remaining: %s", this, commands); + commands.notifyAll(); + return gt(maxComplete, old); } } diff --git a/java/common/src/main/java/org/apache/qpidity/transport/SessionDelegate.java b/java/common/src/main/java/org/apache/qpidity/transport/SessionDelegate.java index bd56149b34..0e289c54e9 100644 --- a/java/common/src/main/java/org/apache/qpidity/transport/SessionDelegate.java +++ b/java/common/src/main/java/org/apache/qpidity/transport/SessionDelegate.java @@ -67,16 +67,27 @@ public abstract class SessionDelegate @Override public void sessionCompleted(Session ssn, SessionCompleted cmp) { RangeSet ranges = cmp.getCommands(); + RangeSet known = null; + if (cmp.getTimelyReply()) + { + known = new RangeSet(); + } + if (ranges != null) { for (Range range : ranges) { - ssn.complete(range.getLower(), range.getUpper()); + boolean advanced = ssn.complete(range.getLower(), range.getUpper()); + if (advanced && known != null) + { + known.add(range); + } } } - if (cmp.getTimelyReply()) + + if (known != null) { - ssn.sessionKnownCompleted(ranges); + ssn.sessionKnownCompleted(known); } } |