[Freeswitch-svn] [commit] r9025 - freeswitch/trunk/src

[Freeswitch SVN]

Author: anthm
Date: Mon Jul 14 18:15:24 2008
New Revision: 9025

Modified:
   freeswitch/trunk/src/switch_core_session.c
   freeswitch/trunk/src/switch_ivr_originate.c

Log:
fix

Modified: freeswitch/trunk/src/switch_core_session.c
==============================================================================
--- freeswitch/trunk/src/switch_core_session.c	(original)
+++ freeswitch/trunk/src/switch_core_session.c	Mon Jul 14 18:15:24 2008
@@ -667,12 +667,12 @@
 	switch_size_t has;
 
 	/* clear resamplers */
+	switch_mutex_lock(session->resample_mutex);
 	switch_resample_destroy(&session->read_resampler);
 	switch_resample_destroy(&session->write_resampler);
-
+	switch_mutex_unlock(session->resample_mutex);
 	/* clear indications */
 	switch_core_session_flush_message(session);
-
 	/* wipe theese, they will be recreated if need be */
 	switch_buffer_destroy(&session->raw_read_buffer);
 	switch_buffer_destroy(&session->raw_write_buffer);
@@ -736,6 +736,9 @@
 	switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Close Channel %s [%s]\n",
 					  switch_channel_get_name((*session)->channel), switch_channel_state_name(switch_channel_get_state((*session)->channel)));
 
+
+	switch_core_session_reset(*session, TRUE);
+	
 	switch_core_media_bug_remove_all(*session);
 	switch_ivr_deactivate_unicast(*session);
 

Modified: freeswitch/trunk/src/switch_ivr_originate.c
==============================================================================
--- freeswitch/trunk/src/switch_ivr_originate.c	(original)
+++ freeswitch/trunk/src/switch_ivr_originate.c	Mon Jul 14 18:15:24 2008
@@ -115,7 +115,6 @@
 			goto wbreak;
 		}
 
-		switch_channel_set_state(channel, CS_SOFT_EXECUTE);
 		switch_core_session_exec(collect->session, application_interface, app_data);
 
 		if (switch_channel_get_state(channel) < CS_HANGUP) {