From: JINMEI Tatuya <jinmei@isc.org>
Date: Fri, 19 Oct 2012 22:07:32 +0000 (-0700)
Subject: [2211] moved DataSrcClientsMgr object from main to auth_srv
X-Git-Tag: trac2402_base~3^2~20
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77d522cf9e3b0cfd5325461b76bbaa2cc8a859f2;p=thirdparty%2Fkea.git

[2211] moved DataSrcClientsMgr object from main to auth_srv

this way we can avoid having a situtation that it's NULL.
---

diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc
index 917ef48689..10861c13a0 100644
--- a/src/bin/auth/auth_srv.cc
+++ b/src/bin/auth/auth_srv.cc
@@ -53,6 +53,7 @@
 #include <auth/query.h>
 #include <auth/statistics.h>
 #include <auth/auth_log.h>
+#include <auth/datasrc_clients_mgr.h>
 
 #include <boost/bind.hpp>
 #include <boost/lexical_cast.hpp>
@@ -328,6 +329,8 @@ private:
     bool validateStatistics(isc::data::ConstElementPtr data) const;
 
     auth::Query query_;
+
+    auth::DataSrcClientsMgr datasrc_clients_mgr_;
 };
 
 AuthSrvImpl::AuthSrvImpl(AbstractXfroutClient& xfrout_client,
diff --git a/src/bin/auth/main.cc b/src/bin/auth/main.cc
index 47131b1bd3..84c7de4159 100644
--- a/src/bin/auth/main.cc
+++ b/src/bin/auth/main.cc
@@ -232,10 +232,6 @@ main(int argc, char* argv[]) {
         isc::server_common::initKeyring(*config_session);
         auth_server->setTSIGKeyRing(&isc::server_common::keyring);
 
-        // Instantiate the data source clients manager.  At the moment
-        // just so we actually create it in system tests.
-        DataSrcClientsMgr datasrc_clients_mgr;
-
         // Start the data source configuration.  We pass first_time and
         // config_session for the hack described in datasrcConfigHandler.
         bool first_time = true;