Index: vhUnitTest/vhLib/WebServiceLogger/impl/VhLibLoggerTest.cls.xml
===================================================================
diff -u -r1316 -r1318
--- vhUnitTest/vhLib/WebServiceLogger/impl/VhLibLoggerTest.cls.xml	(.../VhLibLoggerTest.cls.xml)	(revision 1316)
+++ vhUnitTest/vhLib/WebServiceLogger/impl/VhLibLoggerTest.cls.xml	(.../VhLibLoggerTest.cls.xml)	(revision 1318)
@@ -5,25 +5,38 @@
 
 <Property name="Logger">
 <Type>vhLib.WebServiceLogger.impl.VhLibLogger</Type>
+<Private>1</Private>
 </Property>
 
 <Property name="LogGroep">
 <Type>%String</Type>
 <InitialExpression>"vhUnitTest.vhLib.WebServiceLogger"</InitialExpression>
+<Private>1</Private>
 </Property>
 
 <Property name="Direction">
 <Type>%String</Type>
 <InitialExpression>"in"</InitialExpression>
+<Private>1</Private>
 </Property>
 
-<Property name="IsTreamOneindig">
+<Property name="IsStreamOneindig">
 <Type>%Boolean</Type>
 <InitialExpression>0</InitialExpression>
+<Private>1</Private>
 </Property>
 
+<Property name="BestaandeVhLibWebServiceRequestStream">
+<Type>%Stream.Object</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="TestLogStream">
 <Implementation><![CDATA[
+	Do $$$LogMessage( "Loggroep: " _ ..LogGroep )
+	Do $$$LogMessage( "%request: " _ %request )
+	Do $$$LogMessage( "%request.CgiEnvs: " _ %request.CgiEnvs("HTTP_SOAPACTION") )
+	
 	/// Actie
 	Do ..Logger.LogStream( ##this, ..Direction, ..LogGroep)
 	
@@ -33,15 +46,22 @@
 		"SELECT * FROM vhLib.Logging WHERE Groep = ? AND Detail = ?",
 		$ListBuild( ..LogGroep, "Test" )
 	 )
-	Do $$$AssertTrue( LogItems.Next() )
-	Do $$$AssertFalse( LogItems.Next() )
+	#Dim ResultSetStatus As %Status = ""
+	Do $$$AssertTrue( LogItems.Next(.ResultSetStatus) )
+	Do $$$AssertStatusOK( ResultSetStatus )
+	Do $$$AssertFalse( LogItems.Next(.ResultSetStatus) )
+	Do $$$AssertStatusOK( ResultSetStatus )
 ]]></Implementation>
 </Method>
 
 <Method name="TestLogStreamAfgekort">
 <Implementation><![CDATA[
+	Do $$$LogMessage( "Loggroep: " _ ..LogGroep )
+	Do $$$LogMessage( "%request: " _ %request )
+	Do $$$LogMessage( "%request.CgiEnvs: " _ %request.CgiEnvs("HTTP_SOAPACTION") )
+	
 	/// Setup
-	Set ..IsTreamOneindig = 1
+	Set ..IsStreamOneindig = 1
 	
 	/// Actie
 	Do ..Logger.LogStream( ##this, ..Direction, ..LogGroep)
@@ -52,35 +72,54 @@
 		"SELECT * FROM vhLib.Logging WHERE Groep = ? AND Detail LIKE ?",
 		$ListBuild( ..LogGroep, "Test% ..[deel ontbreekt].." )
 	 )
-	Do $$$AssertTrue( LogItems.Next() )
-	Do $$$AssertFalse( LogItems.Next() )
+	#Dim ResultSetStatus As %Status = ""
+	Do $$$AssertTrue( LogItems.Next(.ResultSetStatus) )
+	Do $$$AssertStatusOK( ResultSetStatus )
+	Do $$$AssertFalse( LogItems.Next(.ResultSetStatus) )
+	Do $$$AssertStatusOK( ResultSetStatus )
 ]]></Implementation>
 </Method>
 
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
+	Do ##super(aTestName)
+	
 	Do ..KuisOpLogItems()
-	Do ..KuisOp()
+	Do ..KuisOpWebserviceLogSetting()
 	
 	Set ..Logger = ##class(vhLib.WebServiceLogger.impl.VhLibLogger).%New()
 	Do ..SetUpRequestStream()
 	Do ..RegistreerDatLogGroepEchtGelogdMoetWorden()
 	
 	Set ..AtEnd = 0
 	
-	Quit ##super(aTestName)
+	Do ..WisVhLibWebServiceRequestStream()
 ]]></Implementation>
 </Method>
 
+<Method name="WisVhLibWebServiceRequestStream">
+<Private>1</Private>
+<Implementation><![CDATA[
+	If ("" '= $G(%vhLibWebServiceRequestStream)) {
+		Set ..BestaandeVhLibWebServiceRequestStream = %vhLibWebServiceRequestStream
+		Kill %vhLibWebServiceRequestStream
+	}
+]]></Implementation>
+</Method>
+
 <Method name="SetUpRequestStream">
+<Private>1</Private>
 <Implementation><![CDATA[
-	Set %request = ##class(%CSP.Request).%New()
+	If ('$Data(%request) || '$IsObject(%request)) {
+		Set %request = ##class(%CSP.Request).%New()
+	}
 	Set %request.CgiEnvs("HTTP_SOAPACTION") = "TestLogStream"
 ]]></Implementation>
 </Method>
 
 <Method name="RegistreerDatLogGroepEchtGelogdMoetWorden">
+<Private>1</Private>
 <Implementation><![CDATA[
 	#Dim LogSetting As vhLib.WebServiceLogger.WebserviceLogSetting = ##class(vhLib.WebServiceLogger.WebserviceLogSetting).%New( ..LogGroep )
 	Set LogSetting.LogNiveau = ##class(vhLib.WebServiceLogger.enu.LogNiveau).Debug()
@@ -91,16 +130,23 @@
 <Method name="OnAfterOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
-	Do ..KuisOp()
+	Do ..KuisOpWebserviceLogSetting()
+	Do ..HerzetVhLibWebServiceRequestStream()
 	Quit ##super(aTestName)
 ]]></Implementation>
 </Method>
 
-<Method name="KuisOp">
+<Method name="HerzetVhLibWebServiceRequestStream">
+<Private>1</Private>
 <Implementation><![CDATA[
-	Kill %request
-	Set %request = ""
+	If $IsObject(..BestaandeVhLibWebServiceRequestStream)
+		Set %vhLibWebServiceRequestStream = ..BestaandeVhLibWebServiceRequestStream
+]]></Implementation>
+</Method>
 
+<Method name="KuisOpWebserviceLogSetting">
+<Private>1</Private>
+<Implementation><![CDATA[
 	If ##class(vhLib.WebServiceLogger.WebserviceLogSetting).%ExistsId( ..LogGroep )
 	{
 		Do ##class(TECH.Exceptions.StatusException).ThrowIndienNietOK(
@@ -110,6 +156,7 @@
 </Method>
 
 <Method name="KuisOpLogItems">
+<Private>1</Private>
 <Implementation><![CDATA[
 	#Dim LogItems As TECH.ResultSet
 	Set ResultSet = ##class(TECH.ResultSet).Create( 
@@ -130,7 +177,7 @@
 <FormalSpec><![CDATA[&len:%Integer=32000,&sc:%Status,&eol:%Boolean]]></FormalSpec>
 <ReturnType>%CacheString</ReturnType>
 <Implementation><![CDATA[
-	If ('..IsTreamOneindig)
+	If ('..IsStreamOneindig)
 	{
 		Set ..AtEnd = 1
 	}