Author: anthm Date: Mon Sep 24 12:56:40 2007 New Revision: 5750 Modified: freeswitch/trunk/src/switch_channel.c Log: fix for FSCORE-51 (maybe 2) Modified: freeswitch/trunk/src/switch_channel.c ============================================================================== --- freeswitch/trunk/src/switch_channel.c (original) +++ freeswitch/trunk/src/switch_channel.c Mon Sep 24 12:56:40 2007 @@ -360,7 +360,7 @@ { assert(channel != NULL); switch_mutex_lock(channel->profile_mutex); - switch_core_hash_insert_dup_locked(channel->private_hash, switch_core_session_strdup(channel->session, key), private_info, channel->flag_mutex); + switch_core_hash_insert_dup_locked(channel->private_hash, switch_core_session_strdup(channel->session, key), private_info, channel->profile_mutex); switch_mutex_unlock(channel->profile_mutex); return SWITCH_STATUS_SUCCESS; } @@ -398,15 +398,13 @@ { assert(channel != NULL); - if (varname) { + if (!switch_strlen_zero(varname)) { switch_mutex_lock(channel->profile_mutex); - switch_core_hash_delete_locked(channel->variables, varname, channel->flag_mutex); + switch_core_hash_delete(channel->variables, varname); if (!switch_strlen_zero(value)) { - switch_core_hash_insert_dup_locked(channel->variables, varname, - switch_clean_string(switch_core_session_strdup(channel->session, value)), channel->flag_mutex); - } else { - switch_core_hash_delete_locked(channel->variables, varname, channel->flag_mutex); - } + switch_core_hash_insert_dup(channel->variables, varname, + switch_clean_string(switch_core_session_strdup(channel->session, value))); + } switch_mutex_unlock(channel->profile_mutex); return SWITCH_STATUS_SUCCESS; } @@ -418,14 +416,12 @@ { assert(channel != NULL); - if (varname) { + if (!switch_strlen_zero(varname)) { switch_mutex_lock(channel->profile_mutex); - switch_core_hash_delete_locked(channel->variables, varname, channel->flag_mutex); + switch_core_hash_delete(channel->variables, varname); if (!switch_strlen_zero(value)) { - switch_core_hash_insert_dup_locked(channel->variables, varname, value, channel->flag_mutex); - } else { - switch_core_hash_delete_locked(channel->variables, varname, channel->flag_mutex); - } + switch_core_hash_insert_dup(channel->variables, varname, value); + } switch_mutex_unlock(channel->profile_mutex); return SWITCH_STATUS_SUCCESS; }