[qpid-dispatch] 13/32: Dataplane: Fixed order problem in shutting down the router. Disabled the reference adaptor by default (uncomment the last line to re-enable). The reference adaptor causes test failures.

[tr...@apache.org]

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

tross pushed a commit to branch dev-protocol-adaptors
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git

commit 084daa1b8b468cbd1af05694bc775fd095ace3ea
Author: Ted Ross <tr...@apache.org>
AuthorDate: Wed Jun 3 16:16:44 2020 -0400

    Dataplane: Fixed order problem in shutting down the router. Disabled the reference adaptor by default (uncomment the last line to re-enable). The reference adaptor causes test failures.
---
 src/adaptors/reference_adaptor.c | 11 ++++++-----
 src/router_node.c                |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/adaptors/reference_adaptor.c b/src/adaptors/reference_adaptor.c
index b4d4afa..ea0ca6f 100644
--- a/src/adaptors/reference_adaptor.c
+++ b/src/adaptors/reference_adaptor.c
@@ -61,19 +61,20 @@ static void qdr_ref_first_attach(void *context, qdr_connection_t *conn, qdr_link
 static void qdr_ref_second_attach(void *context, qdr_link_t *link,
                                   qdr_terminus_t *source, qdr_terminus_t *target)
 {
-    char ftarget[100];
-    char fsource[100];
+#define TERM_SIZE 200
+    char ftarget[TERM_SIZE];
+    char fsource[TERM_SIZE];
 
     ftarget[0] = '\0';
     fsource[0] = '\0';
 
     if (!!source) {
-        size_t size = 100;
+        size_t size = TERM_SIZE;
         qdr_terminus_format(source, fsource, &size);
     }
 
     if (!!target) {
-        size_t size = 100;
+        size_t size = TERM_SIZE;
         qdr_terminus_format(target, ftarget, &size);
     }
 
@@ -285,4 +286,4 @@ void qdr_ref_adaptor_final(void *adaptor_context)
 /**
  * Declare the adaptor so that it will self-register on process startup.
  */
-QDR_CORE_ADAPTOR_DECLARE("ref-adaptor", qdr_ref_adaptor_init, qdr_ref_adaptor_final)
+//QDR_CORE_ADAPTOR_DECLARE("ref-adaptor", qdr_ref_adaptor_init, qdr_ref_adaptor_final)
diff --git a/src/router_node.c b/src/router_node.c
index 70622c6..06c44d9 100644
--- a/src/router_node.c
+++ b/src/router_node.c
@@ -2008,8 +2008,8 @@ void qd_router_free(qd_router_t *router)
 
     qd_container_set_default_node_type(router->qd, 0, 0, QD_DIST_BOTH);
 
-    qdr_protocol_adaptor_free(router->router_core, amqp_direct_adaptor);
     qdr_core_free(router->router_core);
+    qdr_protocol_adaptor_free(router->router_core, amqp_direct_adaptor);
     qd_tracemask_free(router->tracemask);
     qd_timer_free(router->timer);
     sys_mutex_free(router->lock);


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