DISPATCH-1265 - Modified qd_message_send() to check if the delivery h…

…as not been already aborted when try to abort a delivery
apache · Feb 11, 2019 · 9670ce2 · 9670ce2
1 parent 9b45cb9
commit 9670ce2
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/src/message.c b/src/message.c
@@ -1484,7 +1484,9 @@ void qd_message_send(qd_message_t *in_msg,
             // Declare the message to be sent,
             msg->send_complete = true;
             // the link has an outgoing deliver. abort it.
-            pn_delivery_abort(pn_link_current(pnl));
+            if (!pn_delivery_aborted(pn_link_current(pnl))) {
+                pn_delivery_abort(pn_link_current(pnl));
+            }
             return;
         }
 
@@ -1591,7 +1593,9 @@ void qd_message_send(qd_message_t *in_msg,
         if (msg->content->aborted) {
             if (pn_link_current(pnl)) {
                 msg->send_complete = true;
-                pn_delivery_abort(pn_link_current(pnl));
+                if (!pn_delivery_aborted(pn_link_current(pnl))) {
+                    pn_delivery_abort(pn_link_current(pnl));
+                }
             }
             break;
         }
@@ -1655,7 +1659,9 @@ void qd_message_send(qd_message_t *in_msg,
                 msg->cursor.cursor = 0;
 
                 if (msg->content->aborted) {
-                    pn_delivery_abort(pn_link_current(pnl));
+                    if (!pn_delivery_aborted(pn_link_current(pnl))) {
+                        pn_delivery_abort(pn_link_current(pnl));
+                    }
                 }
             }
             else {