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

[FreeSWITCH SVN]

Author: anthm
Date: Tue Feb 24 18:56:17 2009
New Revision: 12269

Log:
FSCORE-309

Modified:
   freeswitch/trunk/src/switch_xml.c

Modified: freeswitch/trunk/src/switch_xml.c
==============================================================================
--- freeswitch/trunk/src/switch_xml.c	(original)
+++ freeswitch/trunk/src/switch_xml.c	Tue Feb 24 18:56:17 2009
@@ -142,6 +142,7 @@
 static switch_thread_rwlock_t *RWLOCK = NULL;
 static switch_thread_rwlock_t *B_RWLOCK = NULL;
 static switch_mutex_t *XML_LOCK = NULL;
+static switch_mutex_t *XML_GEN_LOCK = NULL;
 
 
 struct xml_section_t {
@@ -1553,12 +1554,12 @@
 		if ((conf = switch_xml_find_child(xml, "section", "name", section)) && (tag = switch_xml_find_child(conf, tag_name, key_name, key_value))) {
 			if (clone) {
 				char *x;
-				switch_mutex_lock(XML_LOCK);
+				switch_mutex_lock(XML_GEN_LOCK);
 				x = switch_xml_toxml(tag, SWITCH_FALSE);
+				switch_mutex_unlock(XML_GEN_LOCK);
 				switch_assert(x);
 				*root = switch_xml_parse_str(x, strlen(x));
 				*node = *root;
-				switch_mutex_unlock(XML_LOCK);
 				switch_xml_free(xml);
 			} else {
 				*node = tag;
@@ -1904,6 +1905,7 @@
 	*err = "Success";
 
 	switch_mutex_init(&XML_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL);
+	switch_mutex_init(&XML_GEN_LOCK, SWITCH_MUTEX_NESTED, XML_MEMORY_POOL);
 	switch_thread_rwlock_create(&RWLOCK, XML_MEMORY_POOL);
 	switch_thread_rwlock_create(&B_RWLOCK, XML_MEMORY_POOL);