avoiding deadlock
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5423 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
80a72ea2f1
commit
fc9195fe60
|
@ -319,11 +319,12 @@ SWITCH_DECLARE(char *) switch_channel_get_variable(switch_channel_t *channel, co
|
||||||
if (!(v = switch_core_hash_find(channel->variables, varname))) {
|
if (!(v = switch_core_hash_find(channel->variables, varname))) {
|
||||||
if (!channel->caller_profile || !(v = switch_caller_get_field_by_name(channel->caller_profile, varname))) {
|
if (!channel->caller_profile || !(v = switch_caller_get_field_by_name(channel->caller_profile, varname))) {
|
||||||
if (!strcmp(varname, "base_dir")) {
|
if (!strcmp(varname, "base_dir")) {
|
||||||
return SWITCH_GLOBAL_dirs.base_dir;
|
v = SWITCH_GLOBAL_dirs.base_dir;
|
||||||
}
|
} else {
|
||||||
v = switch_core_get_variable(varname);
|
v = switch_core_get_variable(varname);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
switch_mutex_unlock(channel->profile_mutex);
|
switch_mutex_unlock(channel->profile_mutex);
|
||||||
|
|
||||||
return v;
|
return v;
|
||||||
|
|
Loading…
Reference in New Issue