Index: TECH/XmlObjectUtils.cls.xml
===================================================================
diff -u -r3019 -r3264
--- TECH/XmlObjectUtils.cls.xml	(.../XmlObjectUtils.cls.xml)	(revision 3019)
+++ TECH/XmlObjectUtils.cls.xml	(.../XmlObjectUtils.cls.xml)	(revision 3264)
@@ -22,16 +22,52 @@
 	#define NoXMLDeclaration	0
 	#define IndentTags			1
 
-	If ('Dto.%Extends("%XML.Adaptor")) {
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("XmlObject is niet ondersteund ("_Dto_")."))	
+	Do:$$$Not(Dto.%Extends("%XML.Adaptor")) ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("XmlObject is niet ondersteund ("_Dto_")."))	
+	
+	Try {
+		Do ..ProxyToXMLStream(Dto, XMLStream, .TopTag, $$$IndentTags, $$$AllowEmptyProxy, $$$NoXMLDeclaration)
+	} Catch {
+		#dim Exception As TECH.Exceptions.StatusException = ##class(TECH.ExceptionHandler).Catch("TECH.Exceptions.StatusException")
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"ProxyToXMLStream Failed",Exception.GeefStatus()))
 	}
+]]></Implementation>
+</Method>
+
+<Method name="ProxyToXMLStream">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>pxObj:%XML.Adaptor,DataStream:%Stream.Object,TopTag:%String,blnIndentTags:%Boolean=0,AllowEmptyProxy:%Boolean=0,NoXMLDeclaration:%Boolean</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#define ErrorEmptyProxyObject   $$$ERROR($$$GeneralError,"No proxy-object supplied")
+
+	#dim ClassName As %String
+	#dim tmpStream As %Stream.Object
 	
-	#dim StatusCode As %Status = $$ProxyToXMLStream^vhLib(Dto, XMLStream, .TopTag, $$$IndentTags, $$$AllowEmptyProxy, $$$NoXMLDeclaration)
+	If ('$IsObject(pxObj))&&(pxObj?1"XMLSCHEMA:".E) Set ClassName=$P(pxObj,":",2)
+	Else  Quit:('AllowEmptyProxy)&&('$IsObject(pxObj)) $$$ErrorEmptyProxyObject
+ 
+	Set:('$IsObject($G(DataStream))) DataStream=##class(%FileBinaryStream).%New()
+	Set writer=##class(%XML.Writer).%New()
+	Set writer.Indent=''blnIndentTags
+	Set writer.NoXMLDeclaration=NoXMLDeclaration
+	Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(writer.OutputToStream(DataStream),"Failed to output data to stream")
+	If $IsObject(pxObj) Do
+	. Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(writer.RootObject(pxObj, .TopTag)) 
+	Else  If $L(ClassName) Do
+	. Quit:('##class(%Dictionary.ClassDefinition).%ExistsId(ClassName))
+	. Do writer.AddSchemaNamespace("s")
+	. Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(writer.RootElement("schema"))
+	. Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(writer.Write($$$CRLF))
+	. Do IOToStream^vhLib(.tmpStream, $LB("XMLSCHEMA",ClassName,$G(TopTag),""))
+	. Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(writer.Write(tmpStream))
+	. Set tmpStream=""
+	. Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(writer.EndRootElement())
+	Else  Do
+	. Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(writer.RootElement($G(TopTag,"EMPTY")))
+	. Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(writer.EndRootElement())
+	Set writer=""
 	
-	If $$$ISERR(StatusCode) {
-		#dim Message As %String = "ProxyToXMLStream Failed"
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),Message,StatusCode))
-	}
+	Quit
 ]]></Implementation>
 </Method>
 </Class>