Revision

15832

Author

anthm

Date

2009-12-07 13:07:53 -0600 (Mon, 07 Dec 2009)

Log Message

remove unnecessary line and add NULL check

Modified Paths

• freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c
• freeswitch/trunk/src/switch_channel.c

Diff

--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c	2009-12-07 18:14:27 UTC (rev 15831)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c	2009-12-07 19:07:53 UTC (rev 15832)
@@ -2500,7 +2500,6 @@
 	}
 
 	caller_channel = switch_core_session_get_channel(caller_session);
-	switch_channel_clear_state_handler(caller_channel, NULL);
 
 	if (*exten == '&' && *(exten + 1)) {
 		switch_caller_extension_t *extension = NULL;

--- freeswitch/trunk/src/switch_channel.c	2009-12-07 18:14:27 UTC (rev 15831)
+++ freeswitch/trunk/src/switch_channel.c	2009-12-07 19:07:53 UTC (rev 15832)
@@ -1747,7 +1747,7 @@
 		}
 	} else {
 		for (index = 0; index < i; index++) {
-			if (switch_test_flag(channel->state_handlers[index], SSH_FLAG_STICKY)) {
+			if (channel->state_handlers[index] && switch_test_flag(channel->state_handlers[index], SSH_FLAG_STICKY)) {
 				new_handlers[channel->state_handler_index++] = channel->state_handlers[index];
 			}
 		}