You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2013/06/10 21:46:48 UTC
svn commit: r1491581 - in /qpid/trunk/qpid/cpp/src/qpid/broker:
ConnectionHandler.cpp ConnectionState.h
Author: astitcher
Date: Mon Jun 10 19:46:48 2013
New Revision: 1491581
URL: http://svn.apache.org/r1491581
Log:
QPID-4905: Remove deprecated and unused federation property
Modified:
qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionState.h
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp?rev=1491581&r1=1491580&r2=1491581&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionHandler.cpp Mon Jun 10 19:46:48 2013
@@ -195,7 +195,6 @@ void ConnectionHandler::Handler::startOk
}
connection.setClientProperties(clientProperties);
- connection.setFederationLink(clientProperties.get(QPID_FED_LINK));
if (clientProperties.isSet(QPID_FED_TAG)) {
connection.setFederationPeerTag(clientProperties.getAsString(QPID_FED_TAG));
}
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionState.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionState.h?rev=1491581&r1=1491580&r2=1491581&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionState.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/ConnectionState.h Mon Jun 10 19:46:48 2013
@@ -50,7 +50,6 @@ class ConnectionState : public Connectio
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 Connectio
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 Connectio
std::string userId;
std::string url;
bool userProxyAuth;
- bool federationLink;
std::string federationPeerTag;
std::vector<Url> knownHosts;
std::string userName;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org