[cig-commits] commit: Make _XML_IO_Handler_ReadAllFromBuffer read the buffer correctly

[Mercurial]

changeset:   818:daae2844516e
user:        Walter Landry <wlandry at caltech.edu>
date:        Thu Nov 10 01:11:19 2011 -0800
files:       Base/IO/src/XML_IO_Handler.cxx
description:
Make _XML_IO_Handler_ReadAllFromBuffer read the buffer correctly


diff -r 5abad61cd058 -r daae2844516e Base/IO/src/XML_IO_Handler.cxx
--- a/Base/IO/src/XML_IO_Handler.cxx	Wed Nov 09 00:49:23 2011 -0800
+++ b/Base/IO/src/XML_IO_Handler.cxx	Thu Nov 10 01:11:19 2011 -0800
@@ -679,7 +679,8 @@ Bool _XML_IO_Handler_ReadAllFromBuffer( 
 	}	
 	
 	/* call parse nodes, starting on the first child */
-	_XML_IO_Handler_ParseNodes( self, rootElement, NULL, Dictionary_MergeType_Replace, NULL );
+	_XML_IO_Handler_ParseNodes(self,rootElement->xmlChildrenNode,NULL,
+                                   IO_Handler_DefaultMergeType, NULL );
 	
 	/* free memory */
 	if( self->currDoc )