[asterisk-commits] tzafrir: branch group/zapata_conf r84116 - /team/group/zapata_conf/channels/

[SVN commits to the Asterisk project]

Author: tzafrir
Date: Fri Sep 28 21:06:17 2007
New Revision: 84116

URL: http://svn.digium.com/view/asterisk?view=rev&rev=84116
Log:
Release iflock only after we potentially generate new channels in
users.conf .

Modified:
    team/group/zapata_conf/channels/chan_zap.c

Modified: team/group/zapata_conf/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/team/group/zapata_conf/channels/chan_zap.c?view=diff&rev=84116&r1=84115&r2=84116
==============================================================================
--- team/group/zapata_conf/channels/chan_zap.c (original)
+++ team/group/zapata_conf/channels/chan_zap.c Fri Sep 28 21:06:17 2007
@@ -12904,7 +12904,6 @@
 
 	v = ast_variable_browse(cfg, "channels");
 	res = process_zap(&base_conf, v, reload, 0);
-	ast_mutex_unlock(&iflock);
 	ast_config_destroy(cfg);
 	if (res)
 		return res;
@@ -12920,6 +12919,7 @@
 				if (memcpy(&conf, &base_conf, sizeof(conf)) == NULL) {
 					ast_log(LOG_ERROR, "Not enough memory for conf copy\n");
 					ast_config_destroy(ucfg);
+					ast_mutex_unlock(&iflock);
 					return -1;
 				}
 				process_zap(&conf, ast_variable_browse(ucfg, cat), reload, 0);
@@ -12927,6 +12927,7 @@
 		}
 		ast_config_destroy(ucfg);
 	}
+	ast_mutex_unlock(&iflock);
 #ifdef HAVE_PRI
 	if (!reload) {
 		int x;