From 4663b56e6fa09a0408905a9d58bc7db83bc061d0 Mon Sep 17 00:00:00 2001 From: Ananth Suryanarayana Date: Mon, 12 Dec 2016 14:21:14 -0800 Subject: [PATCH] Do not refer to instance variables in constructor parameters initialization Tools like valgrind does not like it.. IIRC, an issue was also seen (crash) once in production/test environment Change-Id: I3123acfb25a28fe8acd5d828adca1150101783b0 Closes-Bug: 1649415 --- src/bgp/bgp_peer.cc | 4 ++-- src/bgp/bgp_xmpp_channel.cc | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/bgp/bgp_peer.cc b/src/bgp/bgp_peer.cc index f3680bd09a3..9ad6cce3f28 100644 --- a/src/bgp/bgp_peer.cc +++ b/src/bgp/bgp_peer.cc @@ -420,8 +420,6 @@ BgpPeer::BgpPeer(BgpServer *server, RoutingInstance *instance, BgpProto::IBGP : BgpProto::EBGP), state_machine_(BgpObjectFactory::Create(this)), peer_close_(BgpObjectFactory::Create(this)), - close_manager_(BgpObjectFactory::Create( - peer_close_.get())), peer_stats_(new PeerStats(this)), deleter_(new DeleteActor(this)), instance_delete_ref_(this, instance ? instance->deleter() : NULL), @@ -429,6 +427,8 @@ BgpPeer::BgpPeer(BgpServer *server, RoutingInstance *instance, total_flap_count_(0), last_flap_(0), inuse_authkey_type_(AuthenticationData::NIL) { + close_manager_.reset( + BgpObjectFactory::Create(peer_close_.get())); ostringstream oss1; oss1 << peer_key_.endpoint.address(); if (peer_key_.endpoint.port() != BgpConfigManager::kDefaultPort) diff --git a/src/bgp/bgp_xmpp_channel.cc b/src/bgp/bgp_xmpp_channel.cc index 34c27020633..1a60a8d2264 100644 --- a/src/bgp/bgp_xmpp_channel.cc +++ b/src/bgp/bgp_xmpp_channel.cc @@ -467,10 +467,8 @@ BgpXmppChannel::BgpXmppChannel(XmppChannel *channel, bgp_server_(bgp_server), peer_(new XmppPeer(bgp_server, this)), peer_close_(new BgpXmppPeerClose(this)), - close_manager_(BgpObjectFactory::Create( - peer_close_.get())), peer_stats_(new PeerStats(this)), - bgp_policy_(peer_->PeerType(), RibExportPolicy::XMPP, -1, 0), + bgp_policy_(BgpProto::XMPP, RibExportPolicy::XMPP, -1, 0), manager_(manager), delete_in_progress_(false), deleted_(false), @@ -487,6 +485,8 @@ BgpXmppChannel::BgpXmppChannel(XmppChannel *channel, channel->GetTaskInstance(), boost::bind(&BgpXmppChannel::MembershipResponseHandler, this, _1)), lb_mgr_(new LabelBlockManager()) { + close_manager_.reset( + BgpObjectFactory::Create(peer_close_.get())); if (bgp_server) { eor_receive_timer_ = TimerManager::CreateTimer(*bgp_server->ioservice(),