[asterisk-commits] sgriepentrog: branch group/media_formats-reviewed-trunk r418785 - /team/group...

[SVN commits to the Asterisk project]

Author: sgriepentrog
Date: Wed Jul 16 16:23:09 2014
New Revision: 418785

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=418785
Log:
chan_sip: change assert to return for mwi_event_cb

The assertion that peer was not found on final event
message was being triggered on configuration reload.
This patch changes that to just return.


Modified:
    team/group/media_formats-reviewed-trunk/channels/chan_sip.c

Modified: team/group/media_formats-reviewed-trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/team/group/media_formats-reviewed-trunk/channels/chan_sip.c?view=diff&rev=418785&r1=418784&r2=418785
==============================================================================
--- team/group/media_formats-reviewed-trunk/channels/chan_sip.c (original)
+++ team/group/media_formats-reviewed-trunk/channels/chan_sip.c Wed Jul 16 16:23:09 2014
@@ -16811,7 +16811,10 @@
 	struct sip_peer *peer = sip_find_peer(peer_name, NULL, TRUE, FINDALLDEVICES, FALSE, 0);
 
 	if (stasis_subscription_final_message(sub, msg)) {
-		ast_assert(peer == NULL);
+		if (peer) {
+			/* configuration reloaded */
+			return;
+		}
 		ast_free(peer_name);
 		return;
 	}