summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2015-08-24 17:16:48 -0500
committerGerrit Code Review <gerrit2@gerrit.digium.api>2015-08-24 17:16:48 -0500
commit6b8734fe6890dfa4754b07eceaab52a4712297a9 (patch)
treec3ab4ceae2ca93e3aa65913a380671f20440b1c3
parentd36c8aa0062f7b2518fcd5e6100f0a0277117696 (diff)
parenta408369bac5dbbea8fa52f3fe8f4aa13bc323e5e (diff)
Merge "res_pjsip_pubsub: On recreated notify fail deleted sub_tree is referenced"
-rw-r--r--res/res_pjsip_pubsub.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c
index 57c85a4c7..2b42ad6be 100644
--- a/res/res_pjsip_pubsub.c
+++ b/res/res_pjsip_pubsub.c
@@ -1393,8 +1393,9 @@ static int subscription_persistence_recreate(void *obj, void *arg, int flags)
subscription_persistence_update(sub_tree, &rdata);
if (generate_initial_notify(sub_tree->root)) {
pjsip_evsub_terminate(sub_tree->evsub, PJ_TRUE);
+ } else {
+ send_notify(sub_tree, 1);
}
- send_notify(sub_tree, 1);
} else {
ast_sorcery_delete(ast_sip_get_sorcery(), persistence);
}