This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/main by this push:
     new cff75f9  DISPATCH-2056: Do not reference qdr connection after it is 
closed
cff75f9 is described below

commit cff75f9fceff73f7be0cdb2d6590f3a95e4c4281
Author: Chuck Rolke <c...@apache.org>
AuthorDate: Fri May 7 17:22:23 2021 -0400

    DISPATCH-2056: Do not reference qdr connection after it is closed
    
    This closes #1201
---
 src/adaptors/tcp_adaptor.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/adaptors/tcp_adaptor.c b/src/adaptors/tcp_adaptor.c
index 92b9774..435c3b9 100644
--- a/src/adaptors/tcp_adaptor.c
+++ b/src/adaptors/tcp_adaptor.c
@@ -489,15 +489,16 @@ static void handle_disconnected(qdr_tcp_connection_t* 
conn)
                conn->conn_id, conn->outgoing_id);
         qdr_link_detach(conn->outgoing, QD_LOST, 0);
     }
-    if (conn->qdr_conn) {
-        qdr_connection_closed(conn->qdr_conn);
-        qdr_connection_set_context(conn->qdr_conn, 0);
-    }
     if (conn->initial_delivery) {
         qdr_delivery_remote_state_updated(tcp_adaptor->core, 
conn->initial_delivery, PN_RELEASED, true, 0, false);
         qdr_delivery_decref(tcp_adaptor->core, conn->initial_delivery, 
"tcp-adaptor.handle_disconnected - initial_delivery");
         conn->initial_delivery = 0;
     }
+    if (conn->qdr_conn) {
+        qdr_connection_set_context(conn->qdr_conn, 0);
+        qdr_connection_closed(conn->qdr_conn);
+        conn->qdr_conn = 0;
+    }
 
     //need to free on core thread to avoid deleting while in use by management 
agent
     qdr_action_t *action = qdr_action(qdr_del_tcp_connection_CT, 
"delete_tcp_connection");

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

Reply via email to