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-1213 - Do not increment the released count for presettled deliveries. This fixes a regression introduced in an earlier commit
Date Wed, 19 Dec 2018 18:00:40 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 6631c2a  DISPATCH-1213 - Do not increment the released count for presettled deliveries.
This fixes a regression introduced in an earlier commit
6631c2a is described below

commit 6631c2ad270b6fc27ab504a6f7585f1e8ac56475
Author: Ganesh Murthy <gmurthy@redhat.com>
AuthorDate: Wed Dec 19 13:00:28 2018 -0500

    DISPATCH-1213 - Do not increment the released count for presettled deliveries. This fixes
a regression introduced in an earlier commit
---
 src/router_core/transfer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router_core/transfer.c b/src/router_core/transfer.c
index f1d7203..e58e77d 100644
--- a/src/router_core/transfer.c
+++ b/src/router_core/transfer.c
@@ -593,7 +593,7 @@ static void qdr_delete_delivery_internal_CT(qdr_core_t *core, qdr_delivery_t
*de
             if (link->link_direction ==  QD_INCOMING)
                 core->rejected_deliveries++;
         }
-        else if (delivery->disposition == PN_RELEASED) {
+        else if (delivery->disposition == PN_RELEASED && !delivery->presettled)
{
             link->released_deliveries++;
             if (link->link_direction ==  QD_INCOMING)
                 core->released_deliveries++;


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


Mime
View raw message