summaryrefslogtreecommitdiff
path: root/cpp/include
diff options
context:
space:
mode:
authorGordon Sim <gsim@apache.org>2010-04-07 19:41:44 +0000
committerGordon Sim <gsim@apache.org>2010-04-07 19:41:44 +0000
commit00e14b01033ae8c33399bc6ebfd28930498b2533 (patch)
tree3615da0715bfe4f09bb930f108611f47d3ae794c /cpp/include
parent736179f004fbc65bb82f0ceade570375197e29e7 (diff)
downloadqpid-python-00e14b01033ae8c33399bc6ebfd28930498b2533.tar.gz
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
Diffstat (limited to 'cpp/include')
-rw-r--r--cpp/include/qpid/client/SessionBase_0_10.h2
-rw-r--r--cpp/include/qpid/messaging/Connection.h3
-rw-r--r--cpp/include/qpid/messaging/Session.h11
3 files changed, 11 insertions, 5 deletions
diff --git a/cpp/include/qpid/client/SessionBase_0_10.h b/cpp/include/qpid/client/SessionBase_0_10.h
index e76019dd4d..6b7ed97df4 100644
--- a/cpp/include/qpid/client/SessionBase_0_10.h
+++ b/cpp/include/qpid/client/SessionBase_0_10.h
@@ -101,6 +101,8 @@ class SessionBase_0_10 {
QPID_CLIENT_EXTERN Connection getConnection();
+ /** Send sync request without actually blocking for it**/
+ QPID_CLIENT_EXTERN void sendSyncRequest();
protected:
boost::shared_ptr<SessionImpl> impl;
friend class SessionBase_0_10Access;
diff --git a/cpp/include/qpid/messaging/Connection.h b/cpp/include/qpid/messaging/Connection.h
index 34a37ab776..933c503635 100644
--- a/cpp/include/qpid/messaging/Connection.h
+++ b/cpp/include/qpid/messaging/Connection.h
@@ -55,9 +55,6 @@ class Connection : public qpid::messaging::Handle<ConnectionImpl>
* sasl-max-ssf
* protocol
*
- * (note also bounds, locale, max-channels and max-framesize, but
- * not sure whether those should be documented here)
- *
* Reconnect behaviour can be controlled through the following options:
*
* reconnect: true/false (enables/disables reconnect entirely)
diff --git a/cpp/include/qpid/messaging/Session.h b/cpp/include/qpid/messaging/Session.h
index c20de9079b..95f9832576 100644
--- a/cpp/include/qpid/messaging/Session.h
+++ b/cpp/include/qpid/messaging/Session.h
@@ -89,8 +89,15 @@ class Session : public qpid::messaging::Handle<SessionImpl>
*/
QPID_CLIENT_EXTERN void release(Message&);
- QPID_CLIENT_EXTERN void sync();
- QPID_CLIENT_EXTERN void flush();
+ /**
+ * Request synchronisation with the server.
+ *
+ * @param block if true, this call will block until the server
+ * confirms completion of all pending operations; if false the
+ * call will request notifcation from the server but will return
+ * before receiving it.
+ */
+ QPID_CLIENT_EXTERN void sync(bool block=true);
/**
* Returns the total number of messages received and waiting to be