QPID-1711: Ensure the session state between the two peers in an inter-broker bridging session are kept in sync.

(Also made changes to cancellation to ensure that the commands are only issued on the io thread of the connection)



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

1 files changed, 15 insertions, 0 deletions

diff --git a/cpp/src/qpid/SessionState.h b/cpp/src/qpid/SessionState.h
index bf4ff6d326..e99875c489 100644
--- a/cpp/src/qpid/SessionState.h
+++ b/cpp/src/qpid/SessionState.h
@@ -181,6 +181,20 @@ class SessionState {
         const SequenceSet& receivedIncomplete
     );
 
+    /**
+     * So called 'push' bridges work by faking a subscribe request
+     * (and the accompanyingflows etc) to the local broker to initiate
+     * the outflow of messages for the bridge.
+     * 
+     * As the peer doesn't send these it cannot include them in its
+     * session state. To keep the session state on either side of the
+     * bridge in sync, this hack allows the tracking of state for
+     * received messages to be disabled for the faked commands and
+     * subsequently re-enabled.
+     */
+    void disableReceiverTracking();
+    void enableReceiverTracking();
+
   private:
 
     struct SendState {
@@ -209,6 +223,7 @@ class SessionState {
     uint32_t timeout;
     Configuration config;
     bool stateful;
+    bool receiverTrackingDisabled;//very nasty hack for 'push' bridges
 };
 
 inline bool operator==(const SessionId& id, const SessionState& s) { return s == id; }