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();
         }
     }