Fix serious bug that causes crash on CKM exit.

[platform/core/security/key-manager.git] / src / manager / main / key-manager-main.cpp

diff --git a/src/manager/main/key-manager-main.cpp b/src/manager/main/key-manager-main.cpp
index f878cd2..71c76e7 100644 (file)
--- a/src/manager/main/key-manager-main.cpp
+++ b/src/manager/main/key-manager-main.cpp
@@ -29,7 +29,6 @@
 
 #include <dpl/log/log.h>
 #include <dpl/singleton.h>
-#include <dpl/singleton_safe_impl.h>
 
 #include <socket-manager.h>
 
@@ -37,11 +36,8 @@
 #include <ocsp-service.h>
 
 #include <key-provider.h>
-#include <CryptoService.h>
 #include <file-system.h>
 
-IMPLEMENT_SAFE_SINGLETON(CKM::Log::LogSystem);
-
 #define REGISTER_SOCKET_SERVICE(manager, service) \
     registerSocketService<service>(manager, #service)
 
@@ -51,7 +47,7 @@ void registerSocketService(CKM::SocketManager &manager, const std::string& servi
     T *service = NULL;
     try {
         service = new T();
-        service->Create();
+        service->Start();
         manager.RegisterSocketService(service);
         service = NULL;
     } catch (const CKM::Exception &exception) {
@@ -97,7 +93,6 @@ int main(void) {
         OPENSSL_config(NULL);
 
         CKM::KeyProvider::initializeLibrary();
-        CKM::CryptoService::initialize();
 
         {
             LogInfo("Start!");