[svn-commits] file: trunk r431556 - in /trunk: ./ res/res_pjsip_keepalive.c

[SVN commits to the Digium repositories]

Author: file
Date: Tue Feb  3 19:27:52 2015
New Revision: 431556

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=431556
Log:
res_pjsip_keepalive: Don't crash if PJSIP module is not loaded.
........

Merged revisions 431555 from http://svn.asterisk.org/svn/asterisk/branches/13

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip_keepalive.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-13-merged' - no diff available.

Modified: trunk/res/res_pjsip_keepalive.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip_keepalive.c?view=diff&rev=431556&r1=431555&r2=431556
==============================================================================
--- trunk/res/res_pjsip_keepalive.c (original)
+++ trunk/res/res_pjsip_keepalive.c Tue Feb  3 19:27:52 2015
@@ -240,6 +240,8 @@
 
 static int load_module(void)
 {
+	CHECK_PJSIP_MODULE_LOADED();
+
 	ast_sorcery_observer_add(ast_sip_get_sorcery(), "global", &keepalive_global_observer);
 	ast_sorcery_reload_object(ast_sip_get_sorcery(), "global");
 	ast_module_ref(ast_module_info->self);