From 9a79390f474a1dfb61b2d42c61d896ed5cfd109a Mon Sep 17 00:00:00 2001 From: Adam Malinowski Date: Tue, 8 Jul 2014 08:42:40 +0200 Subject: [PATCH] Fix shared pointers access in Cynara class Change-Id: I85c98846655d8363e63640b88f6a756bb16c08d5 --- src/service/main/Cynara.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/service/main/Cynara.cpp b/src/service/main/Cynara.cpp index 57a15d5..c99bbe4 100644 --- a/src/service/main/Cynara.cpp +++ b/src/service/main/Cynara.cpp @@ -56,12 +56,21 @@ void Cynara::init(void) { } void Cynara::run(void) { + if (!m_socketManager) { + throw InitException(); + } + m_socketManager->run(); } void Cynara::finalize(void) { - m_logic->unbindAll(); - m_socketManager->unbindAll(); + if (m_logic) { + m_logic->unbindAll(); + } + + if (m_socketManager) { + m_socketManager->unbindAll(); + } m_logic.reset(); m_socketManager.reset(); -- 2.7.4