Index: AXimpl/MessageInProcessor.cls.xml
===================================================================
diff -u -r49566 -r49618
--- AXimpl/MessageInProcessor.cls.xml	(.../MessageInProcessor.cls.xml)	(revision 49566)
+++ AXimpl/MessageInProcessor.cls.xml	(.../MessageInProcessor.cls.xml)	(revision 49618)
@@ -46,53 +46,59 @@
 </Method>
 
 <Method name="Verwerk">
-<FormalSpec>FullFilename:%String</FormalSpec>
 <Implementation><![CDATA[
 	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)
+	#dim Path As %String = ##class(TECH.Config.ConfigMgr).Instance().GeefString("AX_IF_IN_RequestPath")
+	#dim FileIterator As TECH.Iterator = ..FileAPI.GetFileList(Path,"*.xml")
 
-	Do ##class(TECH.Context.RuntimeContext).Instance().ZetSessieID(SessionId)
 	Do ##class(TECH.Context.RuntimeContext).Instance().ZetApplicatie("AxIncomingFileBasedRequests")
+	do ##class(TECH.Context.RuntimeContext).Instance().ZetSessieID("AX.MessageInProcessor_"_$job)
 	
-	Do ..Logger.Info("Verwerking inkomende AX bestand", "Bestandsnaam " _FullFilename)
-	
-	Try {
-
-		#dim DebugStream As %Stream.Object = ##class(%GlobalCharacterStream).%New()
-		Do DebugStream.WriteLine("Xml data : ")
-		Do DebugStream.CopyFrom(..FileAPI.GeefFileReader(FullFilename).GeefStream())
-		Do ..Logger.Debug("Verwerking inkomende AX stream", DebugStream )	
-		
-		#dim SubPath As %String = ..ExtractSubPath(FullFilename)
-		
-		#dim KlasseNaam As %String = ..ConfigIn.GetRequestEnvelope(SubPath)
-		#dim Message As %CacheString = ..XmlCorrelater.GeefObjectVanBestand(FullFilename, KlasseNaam, "Envelope")
-
-		#dim Converter As AXimpl.Converter = ..ConfigIn.GetConverter(SubPath)
-		Do Converter.Convert(Message)
-		
-		Do ..EventRaiser.RaiseRequestReceivedEvent(SubPath,FullFilename,..FileAPI.GeefFileReader(FullFilename).GeefStream())
-		
-		Do ..FileAPI.DeleteFile(FullFilename)
-	} Catch {
+	#dim VerwerkVolgende as %Boolean = $$$True
+	While (VerwerkVolgende) {
 		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)
+			while (VerwerkVolgende && FileIterator.HasNext()){				
+				#dim FullFilename as %String = FileIterator.Next()
+				#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)
+
+				;verwerking
+				#dim DebugStream As %Stream.Object = ##class(%GlobalCharacterStream).%New()
+				Do DebugStream.WriteLine("Xml data : ")
+				Do DebugStream.CopyFrom(..FileAPI.GeefFileReader(FullFilename).GeefStream())
+				Do ..Logger.Debug("Verwerking inkomende AX stream", DebugStream )	
+								
+				#dim SubPath As %String = ..ExtractSubPath(FullFilename)
+				
+				#dim KlasseNaam As %String = ..ConfigIn.GetRequestEnvelope(SubPath)
+				#dim Message As %CacheString = ..XmlCorrelater.GeefObjectVanBestand(FullFilename, KlasseNaam, "Envelope")
+				#dim Converter As AXimpl.Converter = ..ConfigIn.GetConverter(SubPath)
+				Do Converter.Convert(Message)
+				Do ..EventRaiser.RaiseRequestReceivedEvent(SubPath,FullFilename,..FileAPI.GeefFileReader(FullFilename).GeefStream())
+				Do ..FileAPI.DeleteFile(FullFilename)
+				;eind verwerking
+				Set VerwerkVolgende = $$$False
+			}
+			Set VerwerkVolgende = $$$False
 		} catch {
-			#dim InnerException As TECH.IException = ##class(TECH.ExceptionHandler).Catch()
-		}
+			try {
+				#dim Exception As TECH.IException = ##class(TECH.ExceptionHandler).Catch()
+				if Exception.%IsA(##class(AXimpl.VerwerkAXBerichtLaterOpnieuwException).%ClassName(1)) {
+					Do ..Logger.Info("Verwerk AX bericht '"_FullFilename_"' later opnieuw", Exception.ToString())
+	 			} else {				
+					Do ..LogException(FullFilename, Exception)
+					Do ..EventRaiser.RaiseCorruptedRequestReceivedEvent(FullFilename,..FileAPI.GeefFileReader(FullFilename).GeefStream())
+					Do ..MoveFileToErrorMap(FullFilename , SubPath)
+					Set VerwerkVolgende = $$$False
+				}
+			} catch {
+				#dim InnerException As TECH.IException = ##class(TECH.ExceptionHandler).Catch()
+				Set VerwerkVolgende = $$$False
+			}
+		}	
 	}
-	
 	Lock -^AXimpl.MessageInProcessor
 ]]></Implementation>
 </Method>