qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gmur...@apache.org
Subject [qpid-dispatch] branch master updated: DISPATCH-1265 - Modified qd_message_send() to check if the delivery has not been already aborted when try to abort a delivery
Date Mon, 11 Feb 2019 15:32:21 GMT
This is an automated email from the ASF dual-hosted git repository.

gmurthy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git


The following commit(s) were added to refs/heads/master by this push:
     new 9670ce2  DISPATCH-1265 - Modified qd_message_send() to check if the delivery has
not been already aborted when try to abort a delivery
9670ce2 is described below

commit 9670ce2795b4607e78299050531cb4377c1cefe8
Author: Ganesh Murthy <gmurthy@redhat.com>
AuthorDate: Mon Feb 11 10:32:06 2019 -0500

    DISPATCH-1265 - Modified qd_message_send() to check if the delivery has not been already
aborted when try to abort a delivery
---
 src/message.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/message.c b/src/message.c
index 5b46ea2..c342485 100644
--- 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 {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message