diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2013-06-10 19:46:48 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2013-06-10 19:46:48 +0000 |
| commit | 9cd66c561ad3a193832d839009c884d8f8094c8f (patch) | |
| tree | 765528136e6a7d57423a1da5164e8cda4a0469da /qpid/cpp/src | |
| parent | d1a34c4e190d1616a14526a0cfff900196152629 (diff) | |
| download | qpid-python-9cd66c561ad3a193832d839009c884d8f8094c8f.tar.gz | |
QPID-4905: Remove deprecated and unused federation property
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1491581 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src')
| -rw-r--r-- | qpid/cpp/src/qpid/broker/ConnectionHandler.cpp | 1 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/broker/ConnectionState.h | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp b/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp index d2ab675ecd..68061e2924 100644 --- a/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp +++ b/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp @@ -195,7 +195,6 @@ void ConnectionHandler::Handler::startOk(const ConnectionStartOkBody& body) } connection.setClientProperties(clientProperties); - connection.setFederationLink(clientProperties.get(QPID_FED_LINK)); if (clientProperties.isSet(QPID_FED_TAG)) { connection.setFederationPeerTag(clientProperties.getAsString(QPID_FED_TAG)); } diff --git a/qpid/cpp/src/qpid/broker/ConnectionState.h b/qpid/cpp/src/qpid/broker/ConnectionState.h index 763e3f3afe..1822f0414e 100644 --- a/qpid/cpp/src/qpid/broker/ConnectionState.h +++ b/qpid/cpp/src/qpid/broker/ConnectionState.h @@ -50,7 +50,6 @@ class ConnectionState : public ConnectionToken, public management::Manageable heartbeat(0), heartbeatmax(120), userProxyAuth(false), // Can proxy msgs with non-matching auth ids when true (used by federation links) - federationLink(true), isDefaultRealm(false) {} @@ -73,7 +72,6 @@ class ConnectionState : public ConnectionToken, public management::Manageable void setUserProxyAuth(const bool b) { userProxyAuth = b; } bool isUserProxyAuth() const { return userProxyAuth || federationPeerTag.size() > 0; } // links can proxy msgs with non-matching auth ids - void setFederationLink(bool b) { federationLink = b; } // deprecated - use setFederationPeerTag() instead bool isFederationLink() const { return federationPeerTag.size() > 0; } void setFederationPeerTag(const std::string& tag) { federationPeerTag = std::string(tag); } const std::string& getFederationPeerTag() const { return federationPeerTag; } @@ -107,7 +105,6 @@ class ConnectionState : public ConnectionToken, public management::Manageable std::string userId; std::string url; bool userProxyAuth; - bool federationLink; std::string federationPeerTag; std::vector<Url> knownHosts; std::string userName; |