From: Anthony Minessale <anthm@freeswitch.org>
Date: Mon, 27 Aug 2012 17:50:51 +0000 (-0500)
Subject: FS-4561 revert
X-Git-Tag: v1.2.3^2~158^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a0f752c5640247cd492c86d6e303d5a2d1e9f180;p=thirdparty%2Ffreeswitch.git

FS-4561 revert
---

diff --git a/src/mod/endpoints/mod_sofia/sofia_presence.c b/src/mod/endpoints/mod_sofia/sofia_presence.c
index cf7159ab45..fc7c195e53 100644
--- a/src/mod/endpoints/mod_sofia/sofia_presence.c
+++ b/src/mod/endpoints/mod_sofia/sofia_presence.c
@@ -3320,7 +3320,7 @@ static int sync_sla(sofia_profile_t *profile, const char *to_user, const char *t
 								 "hostname='%q' and profile_name='%q' "
 								 "and sub_to_user='%q' and sub_to_host='%q' "
 								 
-								 "and event='line-seize'", (long) switch_epoch_time_now(NULL) + 2,
+								 "and event='line-seize'", (long) switch_epoch_time_now(NULL),
 								 mod_sofia_globals.hostname, profile->name, to_user, to_host
 								 );
 			
@@ -3349,6 +3349,17 @@ static int sync_sla(sofia_profile_t *profile, const char *to_user, const char *t
 			switch_safe_free(sql);
 		}
 
+
+		sql = switch_mprintf("delete from sip_dialogs where hostname='%q' and profile_name='%q' and "
+							 "((sip_from_user='%q' and sip_from_host='%q') or presence_id='%q@%q') "
+							 "and call_info_state='seized'", mod_sofia_globals.hostname, profile->name, to_user, to_host, to_user, to_host);
+
+
+		if (mod_sofia_globals.debug_sla > 1) {
+			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "CLEAR SQL %s\n", sql);
+		}
+		sofia_glue_execute_sql_now(profile, &sql, SWITCH_TRUE);
+		switch_safe_free(sql);
 	}
 
 
@@ -3415,19 +3426,7 @@ static int sync_sla(sofia_profile_t *profile, const char *to_user, const char *t
 	sh = NULL;
 	switch_core_destroy_memory_pool(&pool);
 
-	
-	if (clear) {
-		sql = switch_mprintf("delete from sip_dialogs where hostname='%q' and profile_name='%q' and "
-							 "((sip_from_user='%q' and sip_from_host='%q') or presence_id='%q@%q') "
-							 "and call_info_state='seized'", mod_sofia_globals.hostname, profile->name, to_user, to_host, to_user, to_host);
-
 
-		if (mod_sofia_globals.debug_sla > 1) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "CLEAR SQL %s\n", sql);
-		}
-		sofia_glue_execute_sql_now(profile, &sql, SWITCH_TRUE);
-		switch_safe_free(sql);
-	}