Delay service thread construction until dependencies are initialized

Change-Id: I386c56804eae770e0bb90acbecc705d14010d804

diff --git a/src/server/main/include/service-thread.h b/src/server/main/include/service-thread.h
index 2818a655b83437ab6617b76a0386e527330919c2..573e496199b2786ca8fdd80874bc0e5dcaffdbf6 100644 (file)
--- a/src/server/main/include/service-thread.h
+++ b/src/server/main/include/service-thread.h
@@ -42,14 +42,14 @@ namespace SecurityManager {
 
 template <class DerivedService, class Event>
 class ServiceThread {
-    std::thread m_thread;
     std::mutex m_eventQueueMutex;
-    std::queue<Event *> m_eventQueues[Priority::END];
     std::condition_variable m_waitCondition;
-
     bool m_quit = false;
+    std::queue<Event *> m_eventQueues[Priority::END];
+    std::thread m_thread; // initialized last
+
 public:
-    ServiceThread() : m_thread([&]{ this->ThreadLoop(); }) {}
+    ServiceThread() : m_thread(&ServiceThread::ThreadLoop, this) {}
 
     ~ServiceThread() {
         {