diff options
author | Stefan Laner <laner@itestra.de> | 2014-02-28 18:25:03 +0100 |
---|---|---|
committer | Stefan Laner <laner@itestra.de> | 2014-02-28 18:25:03 +0100 |
commit | 638d8475dc6764df0e516c6af90f6690a1eb6d8b (patch) | |
tree | a32da84b717d757bb93ca26dbd65faa1b9c4c326 | |
parent | 25cacee1cb53b36a930ed2934fe7c4b2a406ca8a (diff) | |
download | genivi-common-api-dbus-runtime-638d8475dc6764df0e516c6af90f6690a1eb6d8b.tar.gz |
Timeout for introspection call in DBusServiceRegistry set to default
value
-rw-r--r-- | src/CommonAPI/DBus/DBusServiceRegistry.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/CommonAPI/DBus/DBusServiceRegistry.cpp b/src/CommonAPI/DBus/DBusServiceRegistry.cpp index 2041e40..ba74f50 100644 --- a/src/CommonAPI/DBus/DBusServiceRegistry.cpp +++ b/src/CommonAPI/DBus/DBusServiceRegistry.cpp @@ -717,8 +717,7 @@ bool DBusServiceRegistry::introspectDBusObjectPath(const std::string& dbusServic dbusConnection->sendDBusMessageWithReplyAsync( dbusMessageCall, - DBusProxyAsyncCallbackHandler<std::string>::create(instrospectAsyncCallback), - 2000); + DBusProxyAsyncCallbackHandler<std::string>::create(instrospectAsyncCallback)); isResolvingInProgress = true; } @@ -757,7 +756,7 @@ void DBusServiceRegistry::onIntrospectCallback(const CallStatus& callStatus, return; } - auto& dbusUniqueNameRecord = dbusServiceUniqueNameIterator->second; + DBusUniqueNameRecord& dbusUniqueNameRecord = dbusServiceUniqueNameIterator->second; auto dbusObjectPathIterator = dbusUniqueNameRecord.dbusObjectPathsCache.find(dbusObjectPath); const bool isDBusObjectPathFound = (dbusObjectPathIterator != dbusUniqueNameRecord.dbusObjectPathsCache.end()); @@ -765,7 +764,7 @@ void DBusServiceRegistry::onIntrospectCallback(const CallStatus& callStatus, return; } - auto& dbusObjectPathRecord = dbusObjectPathIterator->second; + DBusObjectPathCache& dbusObjectPathRecord = dbusObjectPathIterator->second; dbusObjectPathRecord.state = DBusRecordState::RESOLVED; dbusObjectPathRecord.promiseOnResolve.set_value(dbusObjectPathRecord.state); @@ -1007,14 +1006,14 @@ void DBusServiceRegistry::notifyDBusServiceListeners(const DBusUniqueNameRecord& const DBusRecordState& dbusInterfaceNamesState) { notificationThread_ = std::this_thread::get_id(); - for (auto& dbusServiceName : dbusUniqueNameRecord.ownedBusNames) { + for (const std::string& dbusServiceName : dbusUniqueNameRecord.ownedBusNames) { auto dbusServiceListenersIterator = dbusServiceListenersMap.find(dbusServiceName); if(dbusServiceListenersIterator == dbusServiceListenersMap.end()) { continue; } - auto& dbusServiceListenersRecord = dbusServiceListenersIterator->second; + DBusServiceListenersRecord& dbusServiceListenersRecord = dbusServiceListenersIterator->second; if(dbusServiceListenersRecord.uniqueBusNameState != DBusRecordState::RESOLVED) { continue; } |