Index: AXimpl/MessageInCollector.cls.xml
===================================================================
diff -u -r48832 -r49403
--- AXimpl/MessageInCollector.cls.xml	(.../MessageInCollector.cls.xml)	(revision 48832)
+++ AXimpl/MessageInCollector.cls.xml	(.../MessageInCollector.cls.xml)	(revision 49403)
@@ -8,11 +8,6 @@
 <Private>1</Private>
 </Property>
 
-<Property name="MessageInProcessor">
-<Type>AXimpl.MessageInProcessor</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="%OnNew">
 <FormalSpec>FileAPI:TECH.File.FileAPI</FormalSpec>
 <Private>1</Private>
@@ -21,19 +16,27 @@
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..FileAPI = $$$Inject(FileAPI,##class(TECH.File.impl.FileAPI).%New())
-	set ..MessageInProcessor = ##class(AXimpl.MessageInProcessor).%New()
-	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="Process">
 <Implementation><![CDATA[
-	do ##class(TECH.Context.RuntimeContext).Instance().ZetApplicatie("AxIncomingFileBasedRequests")
-	
 	#dim Path As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath")
-	set IteratorUitvoerder = ##class(TECH.IteratorUitvoerder).%New(..FileAPI.GetFileList(Path,"*.xml") , ##class(TECH.ListUtils).CreateListOfObjects(..MessageInProcessor))
-	do IteratorUitvoerder.VoerUit()
+	
+	#dim FileIterator As TECH.Iterator = ..FileAPI.GetFileList(Path,"*.xml")
+	
+	do ##class(TECH.Context.RuntimeContext).Instance().ZetSessieID("AX.MessageInCollector_"_$job)
+	
+	if FileIterator.HasNext() {
+	
+		set DataBuilder = ##class(TECH.BackgroundProcess.impl.DataBuilder).%New()
+		do DataBuilder.SetClassName("AXimpl.MessageInProcessor")	
+		do DataBuilder.SetMethodName("Verwerk")
+		do DataBuilder.VoegToeDataType(FileIterator.Next())
+		
+		do ##class(TECH.Context).Instance().GeefBackgroundJobAPI().GeefBackgroundProcessStarter().StartProcess(DataBuilder.GetData())
+	}
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/AXimpl/MessageInProcessor/Verwerk/Test.cls.xml
===================================================================
diff -u -r48512 -r49403
--- vhUnitTest/AXimpl/MessageInProcessor/Verwerk/Test.cls.xml	(.../Test.cls.xml)	(revision 48512)
+++ vhUnitTest/AXimpl/MessageInProcessor/Verwerk/Test.cls.xml	(.../Test.cls.xml)	(revision 49403)
@@ -28,11 +28,19 @@
 ]]></Implementation>
 </Method>
 
+<Method name="OnAfterAllTests">
+<Implementation><![CDATA[
+	Lock -^AXimpl.MessageInProcessor:0
+	Do ##super()
+]]></Implementation>
+</Method>
+
 <Method name="Test: Standaard gedrag">
 <Implementation><![CDATA[
 	#dim Filename As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath") _"\SalesOrder\Create\File.txt"
 
 	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
+	Do FileAPIMock.IndienMethodCall("FileExists",Filename).DanReturn($$$True)
 	Do FileAPIMock.VerwachtMethodCall("GeefFileReader",Filename).DanReturn(##class(vhTest.Fake.TECH.File.FileReader).%New())
 	Do FileAPIMock.VerwachtMethodCall("DeleteFile",Filename)
 	
@@ -57,6 +65,26 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Bestand bestaat niet -&gt; niets doen">
+<Implementation><![CDATA[
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_IF_IN_ErrorPath","E:\Errors",..#Applicatie)
+	
+	#dim Stream As %Stream.Object = ..XmlStream()
+	#dim FileReader As TECH.File.FileReader = ##class(vhTest.Fake.TECH.File.FileReader).%New(Stream)
+	#dim Filename As %String = "E:\File.txt"
+	
+	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
+	Do FileAPIMock.VerwachtMethodCall("FileExists",Filename).DanReturn($$$False)
+	Do FileAPIMock.VerwachtMethodCall("GeefFileReader",Filename).ExactAantalKeer(0)
+	Do FileAPIMock.VerwachtMethodCall("MoveFile",Filename,"E:\Errors\File.txt").ExactAantalKeer(0)
+			
+	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock)
+	do MessageInProcessor.Verwerk(Filename)
+	
+	do FileAPIMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="Test: Bestand kan niet gecorreleerd worden">
 <Implementation><![CDATA[
 	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_IF_IN_ErrorPath","E:\Errors",..#Applicatie)
@@ -65,9 +93,14 @@
 	#dim FileReader As TECH.File.FileReader = ##class(vhTest.Fake.TECH.File.FileReader).%New(Stream)
 	#dim Filename As %String = "E:\File.txt"
 	
+	Set DirectoryUtilsStub = ##class(vhTest.Mock.TECH.File.DirectoryUtils).%New()
+	Do DirectoryUtilsStub.IndienMethodCall("CreateIfNotExists",$$$ElkeWaarde).DanDoeNiks()
+	
 	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
+	Do FileAPIMock.IndienMethodCall("FileExists",Filename).DanReturn($$$True)
+	Do FileAPIMock.IndienMethodCall("GeefDirectoryUtils").DanReturn(DirectoryUtilsStub)
 	Do FileAPIMock.VerwachtMethodCall("GeefFileReader",Filename).DanReturn(FileReader)
-	Do FileAPIMock.VerwachtMethodCall("MoveFile",Filename,"E:\Errors\File.txt")
+	Do FileAPIMock.IndienMethodCall("MoveFile",Filename,$$$ElkeWaarde).DanDoeNiks()
 	
 	Set XmlCorrelaterStub = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XmlCorrelaterStub.IndienMethodCall("GeefObjectVanBestand",Filename,"AXif.Dynamics.SalesOrderIn.Envelope","Envelope").DanException(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"",$$$ERROR()))
@@ -83,6 +116,37 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Fout in buitenste catch mag opgegeten worden en mag geen lockingprobleem opleveren">
+<Implementation><![CDATA[
+	Do ##class(TECH.Config.ConfigMgr).Instance().ZetString("AX_IF_IN_ErrorPath","E:\Errors",..#Applicatie)
+	
+	#dim Stream As %Stream.Object = ..XmlStream()
+	#dim FileReader As TECH.File.FileReader = ##class(vhTest.Fake.TECH.File.FileReader).%New(Stream)
+	#dim Filename As %String = "E:\File.txt"
+	
+	Set DirectoryUtilsStub = ##class(vhTest.Mock.TECH.File.DirectoryUtils).%New()
+	Do DirectoryUtilsStub.IndienMethodCall("CreateIfNotExists",$$$ElkeWaarde).DanDoeNiks()
+	
+	Set FileAPIMock = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
+	Do FileAPIMock.IndienMethodCall("FileExists",Filename).DanReturn($$$True)
+	Do FileAPIMock.IndienMethodCall("GeefDirectoryUtils").DanReturn(DirectoryUtilsStub)
+	Do FileAPIMock.VerwachtMethodCall("GeefFileReader",Filename).DanReturn(FileReader)
+	Do FileAPIMock.IndienMethodCall("MoveFile",Filename,$$$ElkeWaarde).DanException(##class(TECH.Exceptions.GeneralErrorException).%New($$$DummyString))
+	
+	Set XmlCorrelaterStub = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
+	Do XmlCorrelaterStub.IndienMethodCall("GeefObjectVanBestand",Filename,"AXif.Dynamics.SalesOrderIn.Envelope","Envelope").DanException(##class(TECH.Exceptions.StatusException).%New(##class(TECH.enu.ExceptionCode).GeneralError(),"",$$$ERROR()))
+	
+	Set EventRaiserMock = ##class(vhTest.Mock.AXimpl.EventRaiser).%New()
+	Do EventRaiserMock.VerwachtMethodCall("RaiseCorruptedRequestReceivedEvent",Filename,..Matches.Stream(Stream))
+	
+	#dim MessageInProcessor As AXimpl.MessageInProcessor = ..InitResponseProcessor(FileAPIMock,XmlCorrelaterStub,EventRaiserMock,)
+	do MessageInProcessor.Verwerk(Filename)
+	
+	do FileAPIMock.Verifieer()
+	do EventRaiserMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="InitResponseProcessor">
 <FormalSpec>FileAPI:TECH.File.FileAPI=..FileAPI,XmlCorrelater:TECH.XMLCorrelater=..XmlCorrelater,EventRaiser:AXimpl.EventRaiser=..EventRaiser,ConfigInMock:AXimpl.ConfigIn=""</FormalSpec>
 <Private>1</Private>
Index: AXimpl/MessageInProcessor.cls.xml
===================================================================
diff -u -r48832 -r49403
--- AXimpl/MessageInProcessor.cls.xml	(.../MessageInProcessor.cls.xml)	(revision 48832)
+++ AXimpl/MessageInProcessor.cls.xml	(.../MessageInProcessor.cls.xml)	(revision 49403)
@@ -48,12 +48,22 @@
 <Method name="Verwerk">
 <FormalSpec>FullFilename:%String</FormalSpec>
 <Implementation><![CDATA[
-	Do ..Logger.Info("Verwerking inkomende AX bestand", "Bestandsnaam " _FullFilename)
+	Lock +^AXimpl.MessageInProcessor:0 
+	Else  Quit	
 	
+	If $$$Not(..FileAPI.FileExists(FullFilename)) {
+		Lock -^AXimpl.MessageInProcessor
+		Quit	
+	}
+	
 	#dim SessionId As %String = ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()
-	set $piece(SessionId," ",2) = ##class(TECH.File).GeefBestandsnaam(FullFilename)
-	do ##class(TECH.Context.RuntimeContext).Instance().ZetSessieID(SessionId)
+	Set $piece(SessionId," ",2) = ##class(TECH.File).GeefBestandsnaam(FullFilename)
+
+	Do ##class(TECH.Context.RuntimeContext).Instance().ZetSessieID(SessionId)
+	Do ##class(TECH.Context.RuntimeContext).Instance().ZetApplicatie("AxIncomingFileBasedRequests")
 	
+	Do ..Logger.Info("Verwerking inkomende AX bestand", "Bestandsnaam " _FullFilename)
+	
 	Try {
 
 		#dim DebugStream As %Stream.Object = ##class(%GlobalCharacterStream).%New()
@@ -72,13 +82,18 @@
 		Do ..EventRaiser.RaiseRequestReceivedEvent(SubPath,FullFilename,..FileAPI.GeefFileReader(FullFilename).GeefStream())
 		
 		Do ..FileAPI.DeleteFile(FullFilename)
-		
 	} Catch {
-		#dim Exception As TECH.IException = ##class(TECH.ExceptionHandler).Catch()
-		Do ..LogException(FullFilename, Exception)
-		Do ..EventRaiser.RaiseCorruptedRequestReceivedEvent(FullFilename,..FileAPI.GeefFileReader(FullFilename).GeefStream())
-		Do ..MoveFileToErrorMap(FullFilename)
+		try {
+			#dim Exception As TECH.IException = ##class(TECH.ExceptionHandler).Catch()
+			Do ..LogException(FullFilename, Exception)
+			Do ..EventRaiser.RaiseCorruptedRequestReceivedEvent(FullFilename,..FileAPI.GeefFileReader(FullFilename).GeefStream())
+			Do ..MoveFileToErrorMap(FullFilename , SubPath)
+		} catch {
+			#dim InnerException As TECH.IException = ##class(TECH.ExceptionHandler).Catch()
+		}
 	}
+	
+	Lock -^AXimpl.MessageInProcessor
 ]]></Implementation>
 </Method>
 
@@ -99,11 +114,12 @@
 </Method>
 
 <Method name="MoveFileToErrorMap">
-<FormalSpec>FullFilename:%String</FormalSpec>
+<FormalSpec>FullFilename:%String,SubPath:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim ErrorPath As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("AX_IF_IN_ErrorPath")
+	#dim ErrorPath As %String = ##class(TECH.Files).AppendSubPath(##class(TECH.Config.ConfigMgr).Instance().GetString("AX_IF_IN_ErrorPath"),##class(TECH.File).GetDirectory(FullFilename))
 	#dim ErrorFilename As %String = ##class(TECH.Files).AppendFile(ErrorPath,##class(TECH.File).GetFilename(FullFilename))
+	Do ..FileAPI.GeefDirectoryUtils().CreateIfNotExists(ErrorPath)
 	Do ..FileAPI.MoveFile(FullFilename,ErrorFilename)
 ]]></Implementation>
 </Method>
@@ -112,8 +128,10 @@
 <FormalSpec>FullFilename:%String,Exception:TECH.IException</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim ExceptionMessage As %String = "Filename : " _FullFilename _$$$CRLF
-	Set ExceptionMessage = ExceptionMessage _Exception.GeefOmschrijving()
+	#dim ExceptionMessage As %Stream.Object = ##class(%GlobalCharacterStream).%New()
+	do ExceptionMessage.WriteLine("Filename : " _FullFilename)
+	do ExceptionMessage.WriteLine("")
+	do ExceptionMessage.CopyFrom(Exception.ToStream())
 	Do ..Logger.Error("Verwerking inkomende AX bestand", ExceptionMessage)
 ]]></Implementation>
 </Method>