5 files changed, 11 insertions, 11 deletions
diff --git a/include/CommonAPI/DBus/DBusConnection.hpp b/include/CommonAPI/DBus/DBusConnection.hpp
index b5c75dd..87264f1 100644
--- a/include/CommonAPI/DBus/DBusConnection.hpp
+++ b/include/CommonAPI/DBus/DBusConnection.hpp
@@ -321,8 +321,6 @@ public:
 
     void deleteAsyncHandlers();
 
-    uint32_t getNumberOfSignalMemberHandlers(DBusSignalHandlerPath handlerPath);
-
     ::DBusConnection* connection_;
     mutable std::recursive_mutex connectionGuard_;
 
@@ -340,16 +338,12 @@ public:
     DBusSignalMatchRulesMap dbusSignalMatchRulesMap_;
 
     DBusSignalHandlerTable dbusSignalHandlers_;
-    DBusSignalHandlerTable dbusSignalHandlersToAdd_;
-    DBusSignalHandlerTable dbusSignalHandlersToRemove_;
 
     std::mutex dbusOMSignalHandlersGuard_;
 
     DBusOMSignalMatchRulesMap dbusOMSignalMatchRulesMap_;
 
     DBusOMSignalHandlerTable dbusOMSignalHandlers_;
-    DBusOMSignalHandlerTable dbusOMSignalHandlersToAdd_;
-    DBusOMSignalHandlerTable dbusOMSignalHandlersToRemove_;
 
     COMMONAPI_EXPORT bool addObjectManagerSignalMatchRule(const std::string& dbusBusName);
     COMMONAPI_EXPORT bool removeObjectManagerSignalMatchRule(const std::string& dbusBusName);
diff --git a/include/CommonAPI/DBus/DBusProxy.hpp b/include/CommonAPI/DBus/DBusProxy.hpp
index f40c4d8..403ce21 100644
--- a/include/CommonAPI/DBus/DBusProxy.hpp
+++ b/include/CommonAPI/DBus/DBusProxy.hpp
@@ -65,7 +65,7 @@ public:
               const std::string& interfaceMemberName,
               const std::string& interfaceMemberSignature,
               std::weak_ptr<DBusProxyConnection::DBusSignalHandler> dbusSignalHandler,
-			  uint32_t tag);
+              uint32_t tag);
 
     COMMONAPI_EXPORT void insertSelectiveSubscription(
             const std::string& interfaceMemberName,
diff --git a/include/CommonAPI/DBus/DBusProxyHelper.hpp b/include/CommonAPI/DBus/DBusProxyHelper.hpp
index 7113d9d..2337fab 100644
--- a/include/CommonAPI/DBus/DBusProxyHelper.hpp
+++ b/include/CommonAPI/DBus/DBusProxyHelper.hpp
@@ -217,7 +217,7 @@ struct DBusProxyHelper<In_<DBusInputStream, DBusOutputStream, InArgs_...>,
             COMMONAPI_VERBOSE("MethodAsync(dbus): Proxy available -> sendMessageWithReplyAsync");
                 return callStatusFuture;
             } else {
-            	return std::future<CallStatus>();
+                return std::future<CallStatus>();
             }
         } else {
             std::shared_ptr< std::unique_ptr< DBusProxyConnection::DBusMessageReplyAsyncHandler > > sharedDbusMessageReplyAsyncHandler(
diff --git a/include/CommonAPI/DBus/DBusServiceRegistry.hpp b/include/CommonAPI/DBus/DBusServiceRegistry.hpp
index 61a4ac5..2edcd8f 100644
--- a/include/CommonAPI/DBus/DBusServiceRegistry.hpp
+++ b/include/CommonAPI/DBus/DBusServiceRegistry.hpp
@@ -132,7 +132,10 @@ class DBusServiceRegistry: public std::enable_shared_from_this<DBusServiceRegist
               mutexOnResolve() {
         }
 
-        ~DBusServiceListenersRecord() {};
+        ~DBusServiceListenersRecord() { 
+            if(uniqueBusNameState == DBusRecordState::RESOLVING && futureOnResolve.valid())
+                promiseOnResolve->set_value(DBusRecordState::NOT_AVAILABLE);
+        };
 
         DBusRecordState uniqueBusNameState;
         std::string uniqueBusName;
@@ -155,7 +158,10 @@ class DBusServiceRegistry: public std::enable_shared_from_this<DBusServiceRegist
               pendingObjectManagerCalls(0) {
         }
 
-        ~DBusObjectPathCache() {}
+        ~DBusObjectPathCache() {
+            if(state == DBusRecordState::RESOLVING && futureOnResolve.valid())
+                promiseOnResolve->set_value(DBusRecordState::NOT_AVAILABLE);
+        }
 
         size_t referenceCount;
         DBusRecordState state;
diff --git a/include/CommonAPI/DBus/DBusStubAdapterHelper.hpp b/include/CommonAPI/DBus/DBusStubAdapterHelper.hpp
index 643109f..0d4e7a7 100644
--- a/include/CommonAPI/DBus/DBusStubAdapterHelper.hpp
+++ b/include/CommonAPI/DBus/DBusStubAdapterHelper.hpp
@@ -350,7 +350,7 @@ protected:
 
          dbusOutputStream.beginWriteMap();
          appendGetAllReply(dbusMessage, dbusOutputStream);
- 		     dbusOutputStream.endWriteMap();
+         dbusOutputStream.endWriteMap();
          dbusOutputStream.flush();
 
          return getDBusConnection()->sendDBusMessage(dbusMessageReply);