FS-4677

diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index d7d7a49cf77e7891ae3060f515c3dfa3b3d10309..eea01d50a56255696217ed34aaf224509e0daf32 100644 (file)
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -934,7 +934,7 @@ static void send_conference_data(sofia_profile_t *profile, switch_event_t *event
                sql = switch_mprintf("select full_to, full_from, contact %q ';_;isfocus', expires, call_id, event, network_ip, network_port, "
                                                         "'%q' as ct,'%q' as pt "
                                                         " from sip_subscriptions where "
-                                                        "hostname='%q' and profile_name='%q' and sub_to_user='%q' and sub_to_host='%q' and event='%q'"
+                                                        "hostname='%q' and profile_name='%q' and sub_to_user='%q' and sub_to_host='%q' and event='%q' "
                                                         "and call_id = '%q' ", 
                                                         switch_sql_concat(),
                                                         type,
@@ -956,10 +956,19 @@ static void send_conference_data(sofia_profile_t *profile, switch_event_t *event
        sofia_glue_execute_sql_callback(profile, profile->ireg_mutex, sql, sofia_presence_send_sql, &cb);
 
        if (switch_true(final)) {
-               sql = switch_mprintf("delete from sip_subscriptions where "
-                                                        "hostname='%q' and profile_name='%q' and sub_to_user='%q' and sub_to_host='%q' and event='%q'",
-                                                        mod_sofia_globals.hostname, profile->name,
-                                                        from_user, from_host, event_str);
+               if (call_id) {
+                        sql = switch_mprintf("delete from sip_subscriptions where "
+                                                                 "hostname='%q' and profile_name='%q' and sub_to_user='%q' and sub_to_host='%q' and event='%q' "
+                                                                "and call_id = '%q' ",
+                                                                 mod_sofia_globals.hostname, profile->name,
+                                                                 from_user, from_host, event_str, call_id);
+
+               } else {
+                       sql = switch_mprintf("delete from sip_subscriptions where "
+                                                                "hostname='%q' and profile_name='%q' and sub_to_user='%q' and sub_to_host='%q' and event='%q'",
+                                                                mod_sofia_globals.hostname, profile->name,
+                                                                from_user, from_host, event_str);
+               }
 
                sofia_glue_execute_sql_now(profile, &sql, SWITCH_TRUE);
        }