1 files changed, 7 insertions, 27 deletions

diff --git a/src/CommonAPI/DBus/DBusConnection.cpp b/src/CommonAPI/DBus/DBusConnection.cpp
index a2fba69..b5d7b06 100644
--- a/src/CommonAPI/DBus/DBusConnection.cpp
+++ b/src/CommonAPI/DBus/DBusConnection.cpp
@@ -556,40 +556,20 @@ std::future<CallStatus> DBusConnection::sendDBusMessageWithReplyAsync(
     dbus_bool_t libdbusSuccess;
 
     suspendDispatching();
-    libdbusSuccess = dbus_connection_send_with_reply(libdbusConnection_,
+    libdbusSuccess = dbus_connection_send_with_reply_set_notify(libdbusConnection_,
                                                          dbusMessage.libdbusMessage_,
                                                          &libdbusPendingCall,
+                                                         onLibdbusPendingCallNotifyThunk,
+                                                         dbusMessageReplyAsyncHandler.get(),
+                                                         onLibdbusDataCleanup,
                                                          timeoutMilliseconds);
 
     if (!libdbusSuccess || !libdbusPendingCall) {
         dbusMessageReplyAsyncHandler->onDBusMessageReply(CallStatus::CONNECTION_FAILED, dbusMessage.createMethodError(DBUS_ERROR_DISCONNECTED));
-        resumeDispatching();
-        return dbusMessageReplyAsyncHandler->getFuture();
-    }
-
-    sendLock_.lock();
-	if (dbus_pending_call_get_completed (libdbusPendingCall)) {
-
-		onLibdbusPendingCallNotifyThunk(libdbusPendingCall, dbusMessageReplyAsyncHandler.get());
-		onLibdbusDataCleanup(dbusMessageReplyAsyncHandler.get());
-
-	} else {
-
-		libdbusSuccess = dbus_pending_call_set_notify(
-						libdbusPendingCall,
-						onLibdbusPendingCallNotifyThunk,
-						dbusMessageReplyAsyncHandler.get(),
-						onLibdbusDataCleanup);
-
-	    if (!libdbusSuccess) {
-	        dbusMessageReplyAsyncHandler->onDBusMessageReply(CallStatus::OUT_OF_MEMORY, dbusMessage);
-	        dbus_pending_call_unref(libdbusPendingCall);
-	        resumeDispatching();
-			sendLock_.unlock();
-	        return dbusMessageReplyAsyncHandler->getFuture();
-	    }
+        dbus_pending_call_unref(libdbusPendingCall);
+	    resumeDispatching();
+	    return dbusMessageReplyAsyncHandler->getFuture();
 	}
-    sendLock_.unlock();
 
     DBusMessageReplyAsyncHandler* replyAsyncHandler = dbusMessageReplyAsyncHandler.release();