Initialize the message type before the topic
authorMatthew Jordan <mjordan@digium.com>
Mon, 27 May 2013 00:06:40 +0000 (00:06 +0000)
committerMatthew Jordan <mjordan@digium.com>
Mon, 27 May 2013 00:06:40 +0000 (00:06 +0000)
Caching topics will during initialization attempt to reference
their message type. The message type therefore has to be
initialized prior to the topic to prevent the dreaded assertion.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389813 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/stasis_endpoints.c

index 252614f..a7b7f55 100644 (file)
@@ -153,6 +153,10 @@ int ast_endpoint_stasis_init(void)
 {
        ast_register_atexit(endpoints_stasis_shutdown);
 
+       if (STASIS_MESSAGE_TYPE_INIT(ast_endpoint_snapshot_type) != 0) {
+               return -1;
+       }
+
        if (!endpoint_topic_all) {
                endpoint_topic_all = stasis_topic_create("endpoint_topic_all");
        }
@@ -171,9 +175,5 @@ int ast_endpoint_stasis_init(void)
                return -1;
        }
 
-       if (STASIS_MESSAGE_TYPE_INIT(ast_endpoint_snapshot_type) != 0) {
-               return -1;
-       }
-
        return 0;
 }