summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Rauwolf <rauwolf@itestra.de>2013-03-06 10:57:46 +0100
committerPhilip Rauwolf <rauwolf@itestra.de>2013-03-06 10:57:46 +0100
commit78ef498d23f448b077d7726011bc640cb9f4afc6 (patch)
tree14493e4eaa4ca5fd96885701a69550fb1cff9aa9
parent66429b922e24b28ae0c8a83b603633347608b942 (diff)
downloadgenivi-common-api-dbus-runtime-78ef498d23f448b077d7726011bc640cb9f4afc6.tar.gz
Removed another potential deadlock that happened during construction of
the serviceRegistry
-rw-r--r--src/CommonAPI/DBus/DBusServiceRegistry.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/CommonAPI/DBus/DBusServiceRegistry.cpp b/src/CommonAPI/DBus/DBusServiceRegistry.cpp
index 31532b1..a0ad227 100644
--- a/src/CommonAPI/DBus/DBusServiceRegistry.cpp
+++ b/src/CommonAPI/DBus/DBusServiceRegistry.cpp
@@ -20,6 +20,7 @@ DBusServiceRegistry::DBusServiceRegistry(std::shared_ptr<DBusProxyConnection> db
DBusServiceRegistry::~DBusServiceRegistry() {
if(initialized_) {
+ std::lock_guard<std::mutex> dbusServicesLock(dbusServicesMutex_);
dbusDaemonProxy_->getNameOwnerChangedEvent().unsubscribe(dbusDaemonProxyNameOwnerChangedEventSubscription_);
dbusDaemonProxy_->getProxyStatusEvent().unsubscribe(dbusDaemonProxyStatusEventSubscription_);
}