force to release MQ instance

diff --git a/src/AITTImpl.cc b/src/AITTImpl.cc
index 9a77e68..eaecaf4 100644 (file)
--- a/src/AITTImpl.cc
+++ b/src/AITTImpl.cc
@@ -65,6 +65,9 @@ AITT::Impl::~Impl(void)
 
     if (aittThread.joinable())
         aittThread.join();
+
+    discovery.SetMQ(nullptr);
+    mq = nullptr;
 }
 
 void AITT::Impl::ThreadMain(void)

diff --git a/src/ModuleManager.cc b/src/ModuleManager.cc
index 960a987..6950c9a 100644 (file)
--- a/src/ModuleManager.cc
+++ b/src/ModuleManager.cc
@@ -78,8 +78,8 @@ std::string ModuleManager::GetTransportFileName(TransportType type)
 
 ModuleManager::ModuleHandle ModuleManager::OpenModule(const char *file)
 {
-    ModuleHandle handle(dlopen(file, RTLD_LAZY | RTLD_LOCAL), [](const void *handle) -> void {
-        if (dlclose(const_cast<void *>(handle)))
+    ModuleHandle handle(dlopen(file, RTLD_LAZY | RTLD_LOCAL), [](void *handle) {
+        if (dlclose(handle))
             ERR("dlclose: %s", dlerror());
     });
     if (handle == nullptr)

diff --git a/src/ModuleManager.h b/src/ModuleManager.h
index 8754ff5..d71872d 100644 (file)
--- a/src/ModuleManager.h
+++ b/src/ModuleManager.h
@@ -35,7 +35,7 @@ class ModuleManager {
     std::unique_ptr<MQ> NewCustomMQ(const std::string &id, const AittOption &option);
 
   private:
-    using ModuleHandle = std::unique_ptr<void, void (*)(const void *)>;
+    using ModuleHandle = std::unique_ptr<void, void (*)(void *)>;
 
     // It should be ("the number of shifts" - 1) of AittProtocol
     enum TransportType {