From 220ba979cfb3b53829b8af91717a88b4e3ad1be3 Mon Sep 17 00:00:00 2001 From: George Joseph Date: Sat, 9 Jan 2016 16:57:45 -0700 Subject: Revert "pjsip_location: Delete contact_status object when contact is deleted" This reverts commit 0a9941de9d24093b5ff44096d1d7406f29d11e45. Matt, This patch causes another problem and should not have been needed. Before this patch, persistent_endpoint_contact_deleted_observer WAS deleting the contact_status when ast_sip_location_delete_contact was called. By deleting it yourself in ast_sip_location_delete_contact it was gone before the observer could run and the observer therefore was throwing an error and not sending stasis/AMI/statsd messages. So, I don't think this was the cause of your original issue. I also had verified the contact AMI and statsd lifecycle and it was working. I'll double check now though. ASTERISK-25675 Reported-by: Daniel Journo Change-Id: Ib586a6b7f90acb641b0c410f659743ab90e84f1a --- res/res_pjsip/location.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'res') diff --git a/res/res_pjsip/location.c b/res/res_pjsip/location.c index 045218424..c070e7dbc 100644 --- a/res/res_pjsip/location.c +++ b/res/res_pjsip/location.c @@ -317,14 +317,6 @@ int ast_sip_location_update_contact(struct ast_sip_contact *contact) int ast_sip_location_delete_contact(struct ast_sip_contact *contact) { - void *contact_status_obj; - - contact_status_obj = ast_sorcery_retrieve_by_id(ast_sip_get_sorcery(), CONTACT_STATUS, ast_sorcery_object_get_id(contact)); - if (contact_status_obj) { - ast_sorcery_delete(ast_sip_get_sorcery(), contact_status_obj); - ao2_ref(contact_status_obj, -1); - } - return ast_sorcery_delete(ast_sip_get_sorcery(), contact); } -- cgit v1.2.3