From 78e2bcba211506cf40d7da89389ca2c075d72bcb Mon Sep 17 00:00:00 2001
From: Andrew Stitcher <astitcher@apache.org>
Date: Mon, 10 Jun 2013 19:46:48 +0000
Subject: 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
---
 cpp/src/qpid/broker/ConnectionHandler.cpp | 1 -
 cpp/src/qpid/broker/ConnectionState.h     | 3 ---
 2 files changed, 4 deletions(-)

(limited to 'cpp/src')

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;
-- 
cgit v1.2.1