QPID-664: removed flush, added option to make sync non-blocking if so desired

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

2 files changed, 3 insertions, 9 deletions

diff --git a/cpp/src/qpid/messaging/Session.cpp b/cpp/src/qpid/messaging/Session.cpp
index cc0b528777..eb5e3766b8 100644
--- a/cpp/src/qpid/messaging/Session.cpp
+++ b/cpp/src/qpid/messaging/Session.cpp
@@ -61,14 +61,9 @@ Receiver Session::createReceiver(const std::string& address)
     return impl->createReceiver(Address(address)); 
 }
 
-void Session::sync()
+void Session::sync(bool block)
 {
-    impl->sync();
-}
-
-void Session::flush()
-{
-    impl->flush();
+    impl->sync(block);
 }
 
 bool Session::nextReceiver(Receiver& receiver, Duration timeout)
diff --git a/cpp/src/qpid/messaging/SessionImpl.h b/cpp/src/qpid/messaging/SessionImpl.h
index 7f76f8556f..7acead5b04 100644
--- a/cpp/src/qpid/messaging/SessionImpl.h
+++ b/cpp/src/qpid/messaging/SessionImpl.h
@@ -44,8 +44,7 @@ class SessionImpl : public virtual qpid::RefCounted
     virtual void reject(Message&) = 0;
     virtual void release(Message&) = 0;
     virtual void close() = 0;
-    virtual void sync() = 0;
-    virtual void flush() = 0;
+    virtual void sync(bool block) = 0;
     virtual Sender createSender(const Address& address) = 0;
     virtual Receiver createReceiver(const Address& address) = 0;
     virtual bool nextReceiver(Receiver& receiver, Duration timeout) = 0;