diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2013-06-19 14:26:03 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2013-06-19 14:26:03 +0000 |
| commit | baf1fc7b0515aaca321bc553c29d4ff60d859500 (patch) | |
| tree | 8b9d09f4ca3666a2c3610fe804f257ca37866c12 /cpp/src/qpid/broker/Bridge.cpp | |
| parent | 37d5fa248b71809a9a05bc9ec22c6db7fcf0eb4e (diff) | |
| download | qpid-python-baf1fc7b0515aaca321bc553c29d4ff60d859500.tar.gz | |
QPID-4905: Tidy up broker::Connection
- Clean up code for accounting for sent frames
- merged Connection and ConnectionState into Connection
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1494639 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/broker/Bridge.cpp')
| -rw-r--r-- | cpp/src/qpid/broker/Bridge.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cpp/src/qpid/broker/Bridge.cpp b/cpp/src/qpid/broker/Bridge.cpp index 75bb98d46f..0c2655f507 100644 --- a/cpp/src/qpid/broker/Bridge.cpp +++ b/cpp/src/qpid/broker/Bridge.cpp @@ -22,7 +22,6 @@ #include "qpid/broker/Broker.h" #include "qpid/broker/FedOps.h" -#include "qpid/broker/ConnectionState.h" #include "qpid/broker/Connection.h" #include "qpid/broker/Link.h" #include "qpid/broker/LinkRegistry.h" @@ -73,7 +72,7 @@ Bridge::Bridge(const std::string& _name, Link* _link, framing::ChannelId _id, queueName(_queueName.empty() ? "qpid.bridge_queue_" + name + "_" + link->getBroker()->getFederationTag() : _queueName), altEx(ae), persistenceId(0), - connState(0), conn(0), initialize(init), detached(false), + conn(0), initialize(init), detached(false), useExistingQueue(!_queueName.empty()), sessionName("qpid.bridge_session_" + name + "_" + link->getBroker()->getFederationTag()) { @@ -104,7 +103,6 @@ Bridge::~Bridge() void Bridge::create(Connection& c) { detached = false; // Reset detached in case we are recovering. - connState = &c; conn = &c; SessionHandler& sessionHandler = c.getChannel(channel); @@ -363,7 +361,7 @@ void Bridge::propagateBinding(const string& key, const string& tagList, qpid::framing::FieldTable* extra_args) { const string& localTag = link->getBroker()->getFederationTag(); - const string& peerTag = connState->getFederationPeerTag(); + const string& peerTag = conn->getFederationPeerTag(); if (tagList.find(peerTag) == tagList.npos) { FieldTable bindArgs; |