Author: sgriepentrog
Date: Fri Aug 29 13:46:19 2014
New Revision: 422358

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=422358
Log:
The assertion that peer was not found on final event
message was being triggered on configuration reload.
This patch changes that case to just return instead.

Review: https://reviewboard.asterisk.org/r/3953/


Modified:
    trunk/channels/chan_sip.c

Modified: trunk/channels/chan_sip.c
URL: 
http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=422358&r1=422357&r2=422358
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Aug 29 13:46:19 2014
@@ -16656,7 +16656,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;
        }


-- 
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --

svn-commits mailing list
To UNSUBSCRIBE or update options visit:
   http://lists.digium.com/mailman/listinfo/svn-commits

Reply via email to