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>