kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-05-29 18:11:33 +00:00
Code Issues Projects Releases Wiki Activity

FSCORE-508

Browse Source 
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15830 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Anthony Minessale 2009-12-07 16:40:42 +00:00
parent 0863bbcbae
commit 540445cb1f
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/switch_cpp.cpp
View File

@ -515,7 +515,7 @@ SWITCH_DECLARE_CONSTRUCTOR CoreSession::CoreSession(switch_core_session_t *new_s
SWITCH_DECLARE_CONSTRUCTOR CoreSession::~CoreSession() SWITCH_DECLARE_CONSTRUCTOR CoreSession::~CoreSession()
{ {
this_check_void(); this_check_void();
destroy(); if (allocated) destroy();
} }
SWITCH_DECLARE(char *) CoreSession::getXMLCDR() SWITCH_DECLARE(char *) CoreSession::getXMLCDR()
@ -918,6 +918,8 @@ SWITCH_DECLARE(void) CoreSession::destroy(void)
return; return;
} }
allocated = 0;
switch_safe_free(xml_cdr_text); switch_safe_free(xml_cdr_text);
switch_safe_free(uuid); switch_safe_free(uuid);
switch_safe_free(tts_name); switch_safe_free(tts_name);
@ -929,14 +931,14 @@ SWITCH_DECLARE(void) CoreSession::destroy(void)
} }
if (channel) { if (channel) {
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
"%s destroy/unlink session from object\n", switch_channel_get_name(channel));
switch_channel_set_private(channel, "CoreSession", NULL); switch_channel_set_private(channel, "CoreSession", NULL);
if (switch_channel_up(channel) && switch_test_flag(this, S_HUP) && !switch_channel_test_flag(channel, CF_TRANSFER)) {
switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
}
} }
switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "destroy/unlink session from object\n");
if (switch_channel_up(channel) && switch_test_flag(this, S_HUP) && !switch_channel_test_flag(channel, CF_TRANSFER)) {
switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
}
switch_core_session_rwunlock(session); switch_core_session_rwunlock(session);
session = NULL; session = NULL;
channel = NULL; channel = NULL;