Index: AXimpl/MessageInProcessor.cls.xml
===================================================================
diff -u -r51750 -r54724
--- AXimpl/MessageInProcessor.cls.xml	(.../MessageInProcessor.cls.xml)	(revision 51750)
+++ AXimpl/MessageInProcessor.cls.xml	(.../MessageInProcessor.cls.xml)	(revision 54724)
@@ -43,8 +43,18 @@
 <Private>1</Private>
 </Property>
 
+<Property name="AXUtils">
+<Type>AXimpl.Utils</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="Files">
+<Type>TECH.Files</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>FileApi:TECH.File.FileAPI="",XmlCorrelater:TECH.XMLCorrelater="",EventRaiser:AXimpl.EventRaiser="",ConfigIn:AXimpl.ConfigIn="",VerwerkBestandOpnieuwAanvraagRepository:AXimpl.VerwerkBestandOpnieuwAanvraagRepository="",MailApi:TECH.Mail.MailAPI="",ExceptionLogger:AXimpl.MessageInProcessor.ExceptionLogger=""</FormalSpec>
+<FormalSpec>FileApi:TECH.File.FileAPI="",XmlCorrelater:TECH.XMLCorrelater="",EventRaiser:AXimpl.EventRaiser="",ConfigIn:AXimpl.ConfigIn="",VerwerkBestandOpnieuwAanvraagRepository:AXimpl.VerwerkBestandOpnieuwAanvraagRepository="",MailApi:TECH.Mail.MailAPI="",ExceptionLogger:AXimpl.MessageInProcessor.ExceptionLogger="",AXUtils:AXimpl.Utils,Files:TECH.Files</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -58,6 +68,8 @@
 	Set ..Logger = ##class(vhLib.Logger).%New()
 	Set ..MailApi = $$$Inject(MailApi, ##class(TECH.Context).Instance().GeefMailAPI())
 	Set ..ExceptionLogger = $$$Inject(ExceptionLogger, ##class(AXimpl.MessageInProcessor.ExceptionLogger).%New())
+	Set ..AXUtils = $$$Inject(AXUtils,##class(AXimpl.Utils).%New())
+	Set ..Files= $$$Inject(Files, ##class(TECH.Files).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -69,10 +81,11 @@
 	Else  Quit
 	
 	#dim Path As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath")
-	
+	#dim ListOfDirectories as %ListOfDataTypes = ..AXUtils.GeefAXRequestDirectoryList(Path)
 	;om  problemen bij maas updates te voorkomen, de eerste 20 bestanden opvragen 
 	;en niet alleen het eerste want nodig om een volgend bestand te kunnen verwerken bij retry exceptions
-	#dim FileIterator As TECH.Iterator = ..FileApi.GetFileList(Path, "*.xml",,,20) ; 
+	;#dim FileIterator As TECH.Iterator = ..FileApi.GetFileList(Path, "*.xml",,,20) ; 
+	#dim FileIterator As TECH.Iterator = ..Files.GetFilesFromListOfDirectories(ListOfDirectories,"*.xml",20)
 
 	Do ##class(TECH.Context.RuntimeContext).Instance().ZetApplicatie("AxIncomingFileBasedRequests")
 	Do ##class(TECH.Context.RuntimeContext).Instance().ZetSessieID("AX.MessageInProcessor_"_$job)