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

[Freeswitch SVN]

Author: anthm
Date: Wed Jun 20 10:50:02 2007
New Revision: 5423

Modified:
   freeswitch/trunk/src/switch_channel.c

Log:
avoiding deadlock

Modified: freeswitch/trunk/src/switch_channel.c
==============================================================================
--- freeswitch/trunk/src/switch_channel.c	(original)
+++ freeswitch/trunk/src/switch_channel.c	Wed Jun 20 10:50:02 2007
@@ -319,9 +319,10 @@
 	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 (!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);