[asterisk-commits] kmoore: trunk r429247 - in /trunk: ./ res/res_pjsip/pjsip_options.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Wed Dec 10 07:16:19 2014
New Revision: 429247

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=429247
Log:
PJSIP: Fix assert on initial mass qualify

This fixes the MWI test regressions caused by r429127 and ensures that
contacts have non-zero qualify_frequency before attempting scheduling.
........

Merged revisions 429245 from http://svn.asterisk.org/svn/asterisk/branches/12
........

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

Modified:
    trunk/   (props changed)
    trunk/res/res_pjsip/pjsip_options.c

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

Modified: trunk/res/res_pjsip/pjsip_options.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_pjsip/pjsip_options.c?view=diff&rev=429247&r1=429246&r2=429247
==============================================================================
--- trunk/res/res_pjsip/pjsip_options.c (original)
+++ trunk/res/res_pjsip/pjsip_options.c Wed Dec 10 07:16:19 2014
@@ -960,7 +960,9 @@
 	initial_interval = contact->qualify_frequency * 1000;
 	initial_interval = (int)(initial_interval * ast_random_double());
 
-	schedule_qualify(contact, initial_interval);
+	if (contact->qualify_frequency) {
+		schedule_qualify(contact, initial_interval);
+	}
 
 	return 0;
 }