Minor refactoring of execution layer

Set sync bit when session is in sync mode



git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@580380 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 15 insertions, 4 deletions

diff --git a/cpp/src/qpid/client/Future.h b/cpp/src/qpid/client/Future.h
index c2f3b426da..667a19e942 100644
--- a/cpp/src/qpid/client/Future.h
+++ b/cpp/src/qpid/client/Future.h
@@ -48,9 +48,16 @@ public:
 
     void sync(SessionCore& session)
     {
-        if (!complete) {
+        if (!isComplete(session)) {
+            session.getExecution().syncTo(command);
+            wait(session);
+        }
+    }
+
+    void wait(SessionCore& session)
+    {
+        if (!isComplete(session)) {
             FutureCompletion callback;
-            session.getExecution().flushTo(command);
             session.getExecution().getCompletionTracker().listenForCompletion(
                 command,                                                     
                 boost::bind(&FutureCompletion::completed, &callback)
@@ -83,8 +90,12 @@ public:
         }
     }
 
-    bool isComplete() {
-        return complete;
+    bool isComplete(SessionCore& session) {
+        return complete || session.getExecution().isComplete(command);
+    }
+
+    bool isCompleteUpTo(SessionCore& session) {
+        return complete || session.getExecution().isCompleteUpTo(command);
     }
 
     void setCommandId(const framing::SequenceNumber& id) { command = id; }