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 | 78e2bcba211506cf40d7da89389ca2c075d72bcb (patch) | |
tree | ac3c8fffd8df714863967421c8784c210686044f | |
parent | 4f914ad72652cbe72f7f261915b74428365f2591 (diff) | |
download | qpid-python-78e2bcba211506cf40d7da89389ca2c075d72bcb.tar.gz |
QPID-4905: Remove deprecated and unused federation property
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1491581 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r-- | cpp/src/qpid/broker/ConnectionHandler.cpp | 1 | ||||
-rw-r--r-- | cpp/src/qpid/broker/ConnectionState.h | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/cpp/src/qpid/broker/ConnectionHandler.cpp b/cpp/src/qpid/broker/ConnectionHandler.cpp index d2ab675ecd..68061e2924 100644 --- a/cpp/src/qpid/broker/ConnectionHandler.cpp +++ b/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/cpp/src/qpid/broker/ConnectionState.h b/cpp/src/qpid/broker/ConnectionState.h index 763e3f3afe..1822f0414e 100644 --- a/cpp/src/qpid/broker/ConnectionState.h +++ b/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; |