Index: TECH/JSON/ParserIntersystemsVersion.cls.xml
===================================================================
diff -u -r3749 -r3756
--- TECH/JSON/ParserIntersystemsVersion.cls.xml	(.../ParserIntersystemsVersion.cls.xml)	(revision 3749)
+++ TECH/JSON/ParserIntersystemsVersion.cls.xml	(.../ParserIntersystemsVersion.cls.xml)	(revision 3756)
@@ -373,10 +373,10 @@
 
 <Method name="ObjectToJSON">
 <ClassMethod>1</ClassMethod>
-<FormalSpec><![CDATA[pObject:%RegisteredObject,&pVisited,pLevel:%Integer=0]]></FormalSpec>
-<ReturnType>%String</ReturnType>
+<FormalSpec><![CDATA[pObject:%RegisteredObject,&pVisited,pLevel:%Integer=0,*JsonStringOutput:%String=""]]></FormalSpec>
+<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	#dim JsonStringOutput = ""
+	#dim Json As %String = ""
 	Set tSC = $$$OK
 	Try {
 		If ((pObject="")||'$IsObject(pObject)||($D(pVisited(pObject)))) {
@@ -392,12 +392,10 @@
 			Quit
 		}
 
-		W "1"
 		Write !,?(pLevel*3),"{"
 		Set JsonStringOutput =  JsonStringOutput_" { "
 
 		// add class name to model
-		W "2"
 		Write !,"_class:'",tClass,"'"
 		Set JsonStringOutput =  JsonStringOutput_"_class:'"_tClass_"'"
 
@@ -461,21 +459,21 @@
 							If (tClientType = "HANDLE") {
 								// object
 								If $IsObject(tValue) {
-									W "3"
-									Set tSC = ..ObjectToJSON(tValue,.pVisited, pLevel + 1)
-									Set JsonStringOutput =  JsonStringOutput_tSC
-									;If $$$ISERR(tSC) {
-									;	w "error"
-									;	Quit
-									;}
+									Set tSC = ..ObjectToJSON(tValue,.pVisited, pLevel + 1, .Json)
+									If $$$ISERR(tSC) {
+										Do ##class(Tools.Wlip).%New(43).String("handle error top")
+										Quit
+									} Else {
+										Set JsonStringOutput =  JsonStringOutput_Json
+									}
+									Set Json = ""
 								}
 								Else {
 									Write "null"
 									Set JsonStringOutput =  JsonStringOutput_"null"
 								}
 							}
 							Else {
-								W "zero"
 								Write $Case(tClientType,"BOOLEAN":$S(tValue:"true",1:"false"),:$S($IsValidNum(tValue):tValue,1:""""_$ZCVT(tValue,"O","JS")_""""))
 								Set JsonStringOutput =  JsonStringOutput_$Case(tClientType,"BOOLEAN":$S(tValue:"true",1:"false"),:$S($IsValidNum(tValue):tValue,1:""""_$ZCVT(tValue,"O","JS")_""""))
 							}
@@ -499,28 +497,27 @@
 								Set JsonStringOutput =  JsonStringOutput_","
 							}
 							Set tValue = tArray.GetAt(tKey)
-							W "een"
 							Write $S($zname(tKey):tKey,$IsValidNum(tKey):tKey,1:""""_$ZCVT(tKey,"O","JS")_""""),":"
 							Set JsonStringOutput =  JsonStringOutput_$S($zname(tKey):tKey,$IsValidNum(tKey):tKey,1:""""_$ZCVT(tKey,"O","JS")_"""")_":"
 
 							If (tClientType = "HANDLE") {
 								// object
 								If $IsObject(tValue) {
-									W "4"
-									Set tSC = ..ObjectToJSON(tValue,.pVisited, pLevel + 1)
-									Set JsonStringOutput =  JsonStringOutput_tSC
-									;If $$$ISERR(tSC) {
-									;	w "error"
-									;	Quit
-									;}
+									Set tSC = ..ObjectToJSON(tValue,.pVisited, pLevel + 1, .Json)
+									If $$$ISERR(tSC) {
+										Do ##class(Tools.Wlip).%New(43).String("handle error")
+										Quit
+									} Else {
+										Set JsonStringOutput =  JsonStringOutput_Json
+									}
+									Set Json = ""
 								}
 								Else {
 									Write "null"
 									Set JsonStringOutput =  JsonStringOutput_"null"
 								}
 							}
 							Else {
-								W "twee"
 								Write $Case(tClientType,"BOOLEAN":$S(tValue:"true",1:"false"),:$S($IsValidNum(tValue):tValue,1:""""_$ZCVT(tValue,"O","JS")_""""))
 								Set JsonStringOutput =  JsonStringOutput_$Case(tClientType,"BOOLEAN":$S(tValue:"true",1:"false"),:$S($IsValidNum(tValue):tValue,1:""""_$ZCVT(tValue,"O","JS")_""""))
 							}
@@ -534,13 +531,13 @@
 				ElseIf (tClientType = "HANDLE") {
 					// object
 					If $IsObject(tValue) {
-						W "5"
-						Set tSC = ..ObjectToJSON(tValue,.pVisited, pLevel + 1)
-						Set JsonStringOutput =  JsonStringOutput_tSC
-						;If $$$ISERR(tSC) {
-						;	w "error"
-						;	Quit
-						;}
+						Set tSC = ..ObjectToJSON(tValue,.pVisited, pLevel + 1,.Json)
+						If $$$ISERR(tSC) {
+							Quit
+						} Else {
+							Set JsonStringOutput =  JsonStringOutput_Json
+						}
+						Set Json = ""
 					}
 					Else {
 						Write "null"
@@ -570,24 +567,23 @@
 					Set JsonStringOutput =  JsonStringOutput_"null"
 				}
 				Else {
-					W "drie"
 					Write $Case(tClientType,"BOOLEAN":$S(tValue:"true",1:"false"),:$S($IsValidNum(tValue):tValue,1:""""_$ZCVT(tValue,"O","JS")_""""))
 					Set JsonStringOutput =  JsonStringOutput_$Case(tClientType,"BOOLEAN":$S(tValue:"true",1:"false"),:$S($IsValidNum(tValue):tValue,1:""""_$ZCVT(tValue,"O","JS")_""""))
 				}
 			}
 			Set tPropName = $$$comMemberNext(tClass,$$$cCLASSproperty,tPropName)
 		}
-		;If $$$ISERR(tSC) Quit
-
+		If $$$ISERR(tSC) Quit
+		
 		Write !,?(pLevel*3),"}"
 		Set JsonStringOutput =  JsonStringOutput_"}"
 	}
 	Catch(ex) {
 		Set tSC = ex.AsStatus()
 		Write "null"
-		Set JsonStringOutput =  JsonStringOutput_"null"
+		Set JsonStringOutput =  ""
 	}
-	Quit JsonStringOutput
+	Quit tSC
 ]]></Implementation>
 </Method>
 </Class>