Index: APPS/TRANSP/GLS/GLSv1/impl/CommunicatieService.cls.xml
===================================================================
diff -u -r40367 -r40503
--- APPS/TRANSP/GLS/GLSv1/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 40367)
+++ APPS/TRANSP/GLS/GLSv1/impl/CommunicatieService.cls.xml	(.../CommunicatieService.cls.xml)	(revision 40503)
@@ -8,8 +8,8 @@
 <Private>1</Private>
 </Property>
 
-<Property name="CommunicatieService">
-<Type>APPS.TRANSP.GLS.CommunicatieService</Type>
+<Property name="CommunicatieServiceLocator">
+<Type>APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator</Type>
 <Private>1</Private>
 </Property>
 
@@ -19,14 +19,15 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>CommunicatieService:APPS.TRANSP.GLS.CommunicatieService</FormalSpec>
+<FormalSpec>CommunicatieServiceLocator:APPS.TRANSP.GLS.GLSv1.CommunicatieServiceLocator</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	set ..RequestBouwer = CommunicatieService.GeefRequestBouwer()
-	set ..CommunicatieService = CommunicatieService
+	set ..CommunicatieServiceLocator = $$$Inject(CommunicatieServiceLocator,##class(APPS.TRANSP.GLS.GLSv1.impl.CommunicatieServiceLocator).%New())
+	set ..RequestBouwer = ..CommunicatieServiceLocator.GeefRequestBouwer()
+	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -96,7 +97,7 @@
 	
 	Try {
 		#dim Response As APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response = ..VerzendBericht(Request)
-	}Catch {
+	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Do ##class(vhLib.Logger).%New("GLS").ErrorMail("VerwerkRequest","Verzenden bericht mislukt."_$C(13,10)_$C(13,10)_Exception.ToString())
 		Set Error =##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.Error).%New("E999",Exception.GeefOmschrijving())
@@ -105,10 +106,10 @@
 
 	set VerzendData.Response = Response
 	
-	If ..CommunicatieService.ResponseBevatFout(Response) {
+	If ..ResponseBevatFout(Response) {
 		set VerzendData.Status = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.enu.Status).Failed()
 		do VerzendData.Save()
-		Set Error = ..CommunicatieService.GeefFoutInResponse(Response)
+		Set Error = ..GeefFoutInResponse(Response)
 		do ..ThrowError(Error, VerzendData)
 	}
 	
@@ -210,6 +211,53 @@
 	Quit BerichtVoorICT
 ]]></Implementation>
 </Method>
+
+<Method name="ResponseBevatFout">
+<FormalSpec>Response:APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim BevatFout As %Boolean = 0
+	set Filter = ##class(TECH.ClassUtils.PropertyFilter).%New()
+	set Filter.BeginnendMet = "E"
+	set Filter.SkipPrivate = 1
+	set itProperties = ##class(TECH.ListIterator).%New(##class(TECH.ClassUtils).GeefProperties(Response.%ClassName(1),Filter))
+	while itProperties.HasNext() && 'BevatFout {
+		#dim Property As %String = itProperties.Next()
+		#dim Waarde As %String = ##class(TECH.StringUtils).TrimWhitespaces($property(Response,Property))
+		If (Property = "E000"){
+			Set BevatFout = 0	
+			If ((Waarde '= "") && (Waarde '= "OK") && ('(##class(TECH.Integer).IsValid(Waarde)))) {
+				Do ##class(vhLib.Logger).%New("GLS").Warning("ResponseBevatFout",Waarde_$C(13,10)_$C(13,10)_$$ObjToText^vhLib(Response))		
+			}
+		}Else{
+			Set BevatFout = (Waarde '= "")
+		}
+	}
+	quit BevatFout
+]]></Implementation>
+</Method>
+
+<Method name="GeefFoutInResponse">
+<FormalSpec>Response:APPS.TRANSP.GLS.GLSv1.Bericht.dto.Response</FormalSpec>
+<ReturnType>APPS.TRANSP.GLS.GLSv1.Bericht.dto.Error</ReturnType>
+<Implementation><![CDATA[
+	set Fout = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.Error).%New()
+	
+	set Filter = ##class(TECH.ClassUtils.PropertyFilter).%New()
+	set Filter.BeginnendMet = "E"
+	set Filter.SkipPrivate = 1
+	set itProperties = ##class(TECH.ListIterator).%New(##class(TECH.ClassUtils).GeefProperties(Response.%ClassName(1),Filter))
+	while itProperties.HasNext() {
+		#dim Property As %String = itProperties.Next()
+		#dim Waarde As %String = $property(Response,Property)
+		if $length(Waarde) {
+			set Fout = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.dto.Error).%New(Property,Waarde)
+		}
+	}
+	
+	quit Fout
+]]></Implementation>
+</Method>
 </Class>