kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-13 00:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip_pubsub: On recreated notify fail deleted sub_tree is referenced"

Browse Source
This commit is contained in:
Mark Michelson
2015-08-24 17:16:48 -05:00
committed by Gerrit Code Review
parent d36c8aa006 a408369bac
commit 6b8734fe68
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/res_pjsip_pubsub.c
View File

@@ -1393,8 +1393,9 @@ static int subscription_persistence_recreate(void *obj, void *arg, int flags)
subscription_persistence_update(sub_tree, &rdata); subscription_persistence_update(sub_tree, &rdata);
if (generate_initial_notify(sub_tree->root)) { if (generate_initial_notify(sub_tree->root)) {
pjsip_evsub_terminate(sub_tree->evsub, PJ_TRUE); pjsip_evsub_terminate(sub_tree->evsub, PJ_TRUE);
} else {
send_notify(sub_tree, 1);
} }
send_notify(sub_tree, 1);
} else { } else {
ast_sorcery_delete(ast_sip_get_sorcery(), persistence); ast_sorcery_delete(ast_sip_get_sorcery(), persistence);
} }