shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Bug #1184: XML template parser takes into account whitespaces text nodes

Browse Source
This commit is contained in:
Carlos Martín 2012-03-27 15:18:42 +02:00 committed by Ruben S. Montero
parent 39d6c081dd
commit fe7a9e6eb4
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/template/Template.cc
View File

@ -443,8 +443,9 @@ Attribute * Template::single_xml_att(const xmlNode * node)
Attribute * attr = 0;
xmlNode * child = node->children;
if( child != 0 && (child->type == XML_TEXT_NODE ||
child->type == XML_CDATA_SECTION_NODE))
if( child->next == 0 && child != 0 &&
(child->type == XML_TEXT_NODE ||
child->type == XML_CDATA_SECTION_NODE))
{
attr = new SingleAttribute(
reinterpret_cast<const char *>(node->name),
@ -464,7 +465,12 @@ Attribute * Template::vector_xml_att(const xmlNode * node)
xmlNode * child = node->children;
xmlNode * grandchild = 0;
if(child != 0 && child->type == XML_ELEMENT_NODE)
while(child != 0 && child->type != XML_ELEMENT_NODE)
{
child = child->next;
}
if(child != 0)
{
attr = new VectorAttribute(
reinterpret_cast<const char *>(node->name));