Merge "Initialize BgpEvpnManagerTest::tag_ properly in the constructo…

…r Also initialize XmppServer::max_connections_, which got missed out in a previous commit" into R2.20
Juniper · Aug 3, 2015 · 9902158 · 9902158
2 parents 1ae54b3 + 60bd390
commit 9902158
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/bgp/test/bgp_evpn_manager_test.cc b/src/bgp/test/bgp_evpn_manager_test.cc
@@ -157,7 +157,7 @@ class BgpEvpnManagerTest : public ::testing::TestWithParam<uint32_t> {
     static const int kVrfId = 1;
     static const int kVnIndex = 1;
 
-    BgpEvpnManagerTest() : thread_(&evm_) {
+    BgpEvpnManagerTest() : thread_(&evm_), tag_(0) {
     }
 
     virtual void SetUp() {

diff --git a/src/xmpp/xmpp_server.cc b/src/xmpp/xmpp_server.cc
@@ -55,6 +55,7 @@ XmppServer::XmppServer(EventManager *evm, const string &server_addr,
                        const XmppChannelConfig *config)
     : XmppConnectionManager(
           evm, ssl::context::tlsv1_server, config->auth_enabled, true),
+      max_connections_(0),
       lifetime_manager_(XmppObjectFactory::Create<XmppLifetimeManager>(
           TaskScheduler::GetInstance()->GetTaskId("bgp::Config"))),
       deleter_(new DeleteActor(this)),