Backport of fix for GLIPCI-165.

Once resumeDispatching() is called,
readWriteDispatch() may dispatch the
reply, causing replyAsyncHandler to
be deleted.

Conflicts:

	src/CommonAPI/DBus/DBusConnection.cpp

diff --git a/src/CommonAPI/DBus/DBusConnection.cpp b/src/CommonAPI/DBus/DBusConnection.cpp
index 3b58241..fc35997 100644 (file)
--- a/src/CommonAPI/DBus/DBusConnection.cpp
+++ b/src/CommonAPI/DBus/DBusConnection.cpp
@@ -414,6 +414,7 @@ std::future<CallStatus> DBusConnection::sendDBusMessageWithReplyAsync(
     DBusPendingCall* libdbusPendingCall;
     dbus_bool_t libdbusSuccess;
 
+    suspendDispatching();
     libdbusSuccess = dbus_connection_send_with_reply(
                     libdbusConnection_,
                     dbusMessage.libdbusMessage_,
@@ -422,6 +423,7 @@ std::future<CallStatus> DBusConnection::sendDBusMessageWithReplyAsync(
 
     if (!libdbusSuccess || !libdbusPendingCall) {
        dbusMessageReplyAsyncHandler->onDBusMessageReply(CallStatus::CONNECTION_FAILED, dbusMessage);
+       resumeDispatching();
         return dbusMessageReplyAsyncHandler->getFuture();
     }
 
@@ -434,10 +436,15 @@ std::future<CallStatus> DBusConnection::sendDBusMessageWithReplyAsync(
     if (!libdbusSuccess) {
        dbusMessageReplyAsyncHandler->onDBusMessageReply(CallStatus::OUT_OF_MEMORY, dbusMessage);
         dbus_pending_call_unref(libdbusPendingCall);
+        resumeDispatching();
         return dbusMessageReplyAsyncHandler->getFuture();
     }
 
-    return dbusMessageReplyAsyncHandler.release()->getFuture();
+    std::future<CallStatus> result = dbusMessageReplyAsyncHandler.release()->getFuture();
+
+    resumeDispatching();
+
+    return result;
 }