summaryrefslogtreecommitdiff
path: root/qpid/java/common/src/main
diff options
context:
space:
mode:
authorRafael H. Schloming <rhs@apache.org>2008-12-23 21:09:48 +0000
committerRafael H. Schloming <rhs@apache.org>2008-12-23 21:09:48 +0000
commit3430d8e2d64d41a5cd51e66eb2d8d263270d04aa (patch)
tree362b401f67fad5fb9fbb8edd1aca0fd2d269325a /qpid/java/common/src/main
parent564775ae717db7743d41f7620cde8845dc7d35b8 (diff)
downloadqpid-python-3430d8e2d64d41a5cd51e66eb2d8d263270d04aa.tar.gz
QPID-1549: don't throw not implemented when we get a flush with the expected bit set
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@729118 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/common/src/main')
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java13
-rw-r--r--qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java2
2 files changed, 14 insertions, 1 deletions
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java
index 8877b7b683..22561dcc33 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/Session.java
@@ -312,6 +312,19 @@ public class Session extends SessionInvoker
}
}
+ void flushExpected()
+ {
+ RangeSet rs = new RangeSet();
+ synchronized (processedLock)
+ {
+ if (incomingInit)
+ {
+ rs.add(commandsIn);
+ }
+ }
+ sessionExpected(rs, null);
+ }
+
public void flushProcessed(Option ... options)
{
RangeSet copy;
diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java
index 7cc0ed6617..520291e71c 100644
--- a/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java
+++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/SessionDelegate.java
@@ -115,7 +115,7 @@ public class SessionDelegate
}
if (flush.getExpected())
{
- throw new Error("not implemented");
+ ssn.flushExpected();
}
}