[asterisk-commits] mjordan: trunk r389813 - /trunk/main/stasis_endpoints.c

[SVN commits to the Asterisk project]

Author: mjordan
Date: Sun May 26 19:06:40 2013
New Revision: 389813

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=389813
Log:
Initialize the message type before the topic

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.

Modified:
    trunk/main/stasis_endpoints.c

Modified: trunk/main/stasis_endpoints.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/stasis_endpoints.c?view=diff&rev=389813&r1=389812&r2=389813
==============================================================================
--- trunk/main/stasis_endpoints.c (original)
+++ trunk/main/stasis_endpoints.c Sun May 26 19:06:40 2013
@@ -153,6 +153,10 @@
 {
 	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 @@
 		return -1;
 	}
 
-	if (STASIS_MESSAGE_TYPE_INIT(ast_endpoint_snapshot_type) != 0) {
-		return -1;
-	}
-
 	return 0;
 }