summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Michelson <mmichelson@digium.com>2016-01-11 17:43:43 -0600
committerGerrit Code Review <gerrit2@gerrit.digium.api>2016-01-11 17:43:43 -0600
commitf9a275fef477246b36b0b2d102587c812a786518 (patch)
treef88b6b20783e281c68e96baf2300349638a9468a
parent77a46ac84dd97e62187c44cc9f7ff8a9df1827d0 (diff)
parent4b10fc917340bbbfe6222fa7c6131f004912879a (diff)
Merge "Revert "pjsip_location: Delete contact_status object when contact is deleted"" into 13
-rw-r--r--res/res_pjsip/location.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/res/res_pjsip/location.c b/res/res_pjsip/location.c
index a34e5cdf3..2908f6f70 100644
--- a/res/res_pjsip/location.c
+++ b/res/res_pjsip/location.c
@@ -322,14 +322,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);
}