Skip to content
Snippets Groups Projects
Commit 220ba979 authored by George Joseph's avatar George Joseph
Browse files

Revert "pjsip_location: Delete contact_status object when contact is deleted"

This reverts commit 0a9941de.

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
parent e6f77da6
No related branches found
No related tags found
No related merge requests found
...@@ -317,14 +317,6 @@ int ast_sip_location_update_contact(struct ast_sip_contact *contact) ...@@ -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) 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); return ast_sorcery_delete(ast_sip_get_sorcery(), contact);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment