Index: AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter.cls.xml
===================================================================
diff -u -r49628 -r49692
--- AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter.cls.xml	(.../EnvelopeConverter.cls.xml)	(revision 49628)
+++ AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter.cls.xml	(.../EnvelopeConverter.cls.xml)	(revision 49692)
@@ -28,8 +28,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="MultiGlobalLocker">
+<Type>TECH.Lock.MultiGlobalLocker</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>ProductItemConverter:AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter,ProductAPI:DOM.PM.ProductAPI,ProductLookup:AXimpl.Admin.Common.ProductBepaler,MailAPI:TECH.Mail.MailAPI,Logger:vhLib.Logger</FormalSpec>
+<FormalSpec>ProductItemConverter:AXimpl.Dynamics.ProductItemUpsertIn.Converter.ProductItemConverter,ProductAPI:DOM.PM.ProductAPI,ProductLookup:AXimpl.Admin.Common.ProductBepaler,MailAPI:TECH.Mail.MailAPI,Logger:vhLib.Logger,MultiGlobalLocker:TECH.Lock.MultiGlobalLocker</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -40,6 +45,7 @@
 	Set ..ProductLookup = $$$Inject(ProductLookup, ##class(AXimpl.Admin.Common.ProductBepaler).%New())
 	Set ..MailAPI = $$$Inject(MailAPI,##class(TECH.Context).Instance().GeefMailAPI())
 	Set ..Logger = $$$Inject(Logger,##class(vhLib.Logger).%New())
+	Set ..MultiGlobalLocker = $$$Inject(MultiGlobalLocker, ##class(TECH.Lock.MultiGlobalLocker).%New())
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -48,35 +54,49 @@
 <FormalSpec>Message:AXif.Dynamics.ProductItemIn.Envelope</FormalSpec>
 <Implementation><![CDATA[
 	If ##class(TECH.Config.ConfigMgr).Instance().GeefBoolean("ProductSyncAX2AdminActief") {
-		#Dim LegalEntity as %String
-		Set ProductItemIterator = ##class(TECH.ListIterator).%New(Message.Body.MessageParts.MessagePart.Item)
-		Set LegalEntity = Message.Body.MessageParts.MessagePart.SenderId
-		If $$$Not($Length(LegalEntity)){
-			Do ##class(TECH.Exceptions.InvalidInputException).Throw("SenderId is niet gespecifieerd in xml bericht. Fout in AX poort configuratie.")
-		}
-		While ProductItemIterator.HasNext(){
-			#dim ProductItem as AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem = ProductItemIterator.Next()
-			Do ..ProductItemConverter.ConvertProductItem(ProductItem,LegalEntity)
-			
-			Set SOPRIterator = ##class(TECH.ListIterator).%New(ProductItem.SOPR)
-			While SOPRIterator.HasNext(){
-				#dim SOPRProductId = ""
-				#dim SOPR as AXif.Dynamics.ProductItemIn.MessageParts.AxdEntitySOPR = SOPRIterator.Next()
-				try {
-					Set SOPRProductId = ..ProductLookup.GeefProductIdVoorLeverancierId(ProductItem.ItemId,##class(DOM.AKP.enu.Leverancier).Blum(),SOPR.ContractId)
-				} catch {
-					#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch(##class(TECH.Exceptions.InvalidInputException).%ClassName(1))				
-				}		
-				If $Length(SOPRProductId){			
-					#dim SOPRProduct as DOM.PM.Product = ..ProductAPI.GeefProduct(SOPRProductId)
-					#dim SOPRIdentNummer = SOPRProduct.GeefIdentNr()
-					#dim SOPRKorttekst = SOPRProduct.GeefKorttekst() ; korttekst is aangepast in cache en die willen we behouden
-					#dim SOPRPrice as %Numeric = SOPR.CostPrice
-					Do ..ProductItemConverter.ConvertProductItem(..ApplySOPRToProductItem(ProductItem,SOPRIdentNummer, SOPRPrice,SOPRKorttekst),LegalEntity)
-				} else {
-					Do ..StuurOntbrekendeSOPRMail(ProductItem.ItemId,SOPR.ContractId)
+		
+		Do ..MultiGlobalLocker.ClearGlobalRefs()
+		Do ..VoegToeTeLockenProductenVanBericht(Message)
+		if ..MultiGlobalLocker.Lock(1){
+			try {
+				#Dim LegalEntity as %String
+				Set ProductItemIterator = ##class(TECH.ListIterator).%New(Message.Body.MessageParts.MessagePart.Item)
+				Set LegalEntity = Message.Body.MessageParts.MessagePart.SenderId
+				If $$$Not($Length(LegalEntity)){
+					Do ##class(TECH.Exceptions.InvalidInputException).Throw("SenderId is niet gespecifieerd in xml bericht. Fout in AX poort configuratie.")
 				}
+				While ProductItemIterator.HasNext(){
+					#dim ProductItem as AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem = ProductItemIterator.Next()
+					Do ..ProductItemConverter.ConvertProductItem(ProductItem,LegalEntity)
+					
+					Set SOPRIterator = ##class(TECH.ListIterator).%New(ProductItem.SOPR)
+					While SOPRIterator.HasNext(){
+						#dim SOPRProductId = ""
+						#dim SOPR as AXif.Dynamics.ProductItemIn.MessageParts.AxdEntitySOPR = SOPRIterator.Next()
+						try {
+							Set SOPRProductId = ..ProductLookup.GeefProductIdVoorLeverancierId(ProductItem.ItemId,##class(DOM.AKP.enu.Leverancier).Blum(),SOPR.ContractId)
+						} catch {
+							#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch(##class(TECH.Exceptions.InvalidInputException).%ClassName(1))				
+						}		
+						If $Length(SOPRProductId){			
+							#dim SOPRProduct as DOM.PM.Product = ..ProductAPI.GeefProduct(SOPRProductId)
+							#dim SOPRIdentNummer = SOPRProduct.GeefIdentNr()
+							#dim SOPRKorttekst = SOPRProduct.GeefKorttekst() ; korttekst is manueel aangepast in cache en die willen we behouden
+							#dim SOPRPrice as %Numeric = SOPR.CostPrice
+							Do ..ProductItemConverter.ConvertProductItem(..ApplySOPRToProductItem(ProductItem,SOPRIdentNummer, SOPRPrice,SOPRKorttekst),LegalEntity)
+						} else {
+							Do ..StuurOntbrekendeSOPRMail(ProductItem.ItemId,SOPR.ContractId)
+						}
+					}
+				}
+			} catch {
+				Do ..MultiGlobalLocker.Unlock()
+				#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()				
+				Do ##class(TECH.ExceptionHandler).Rethrow(Exceptie)
 			}
+			Do ..MultiGlobalLocker.Unlock()
+		} else {
+			Do ##class(TECH.ExceptionHandler).Throw(##class(AXimpl.VerwerkAXBerichtLaterOpnieuwException).%New("Productsynchronizatie bericht zal straks opnieuw verwerkt worden om dat één of meerdere producten van het bericht gelocked waren"))
 		}
 	} else {
 		Do ##class(vhLib.Logger).%New().Info("AX Naar Cache klanten sync","Bericht gevonden, maar synchronizatie niet actief (configitem ProductSyncAX2AdminActief)")
@@ -116,11 +136,41 @@
 	While TranlationIterator.HasNext(){		
 		Set TranlationIterator.Next().Name = SOPRKorttekst
 	}	
-
-	
 	Quit ProductItem
 ]]></Implementation>
 </Method>
+
+<Method name="VoegToeTeLockenProductenVanBericht">
+<FormalSpec>Message:AXif.Dynamics.ProductItemIn.Envelope</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	Set ProductItemIterator = ##class(TECH.ListIterator).%New(Message.Body.MessageParts.MessagePart.Item)
+	While ProductItemIterator.HasNext(){
+		#dim ProductItem as AXif.Dynamics.ProductItemIn.MessageParts.AxdEntityItem = ProductItemIterator.Next()
+		try {
+			#Dim ProdID as %String = ..ProductAPI.GeefProductIdVoorIdentNummer(ProductItem.ItemId)
+			Do ..MultiGlobalLocker.VoegToeGlobalRef("^KPR("_ ProdID_")")
+		} catch {
+			; opeten, nieuw product dus nog geen id, moet dus ook niet gelocked worden
+			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch(##class(TECH.Exceptions.InvalidInputException).%ClassName(1))				
+		}
+		Set SOPRIterator = ##class(TECH.ListIterator).%New(ProductItem.SOPR)
+		While SOPRIterator.HasNext(){
+			#dim SOPRProductID = ""
+			#dim SOPR as AXif.Dynamics.ProductItemIn.MessageParts.AxdEntitySOPR = SOPRIterator.Next()
+			try {
+				Set SOPRProductID = ..ProductLookup.GeefProductIdVoorLeverancierId(ProductItem.ItemId,##class(DOM.AKP.enu.Leverancier).Blum(),SOPR.ContractId)
+			} catch {
+				; opeten: sopr variant die nog niet manueel aangemaakt is in cache, opgevangen in de ProductItemConverter
+				#dim SOPRException As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch(##class(TECH.Exceptions.InvalidInputException).%ClassName(1))				
+			}		
+			If $$$HasLength(SOPRProductID){			
+				Do ..MultiGlobalLocker.VoegToeGlobalRef("^KPR("_ SOPRProductID_")")
+			}
+		}
+	}
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter/Test.cls.xml
===================================================================
diff -u -r49628 -r49692
--- vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 49628)
+++ vhUnitTest/AXimpl/Dynamics/ProductItemUpsertIn/Converter/EnvelopeConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 49692)
@@ -22,6 +22,7 @@
 	Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","IdentNummer","L||5005","vhbe-08614").DanReturn("")
 		
 	#dim ProductAPIMock as vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
+	Do ProductAPIMock.VerwachtMethodCall("GeefProductIdVoorIdentNummer","IdentNummer").DanReturn("ProductID")
 	
 	Set MailMock = ##class(vhTest.Mock.TECH.Mail.Mail).%New()
 	Do MailMock.VerwachtMethodCall("ZetVerzender",$$$SystemMail("Product Synchronizatie AX - Admin")).DanDoeNiks()
@@ -35,14 +36,22 @@
 	set LoggerMock = ##class(vhTest.Mock.vhLib.Logger).%New()
 	Do LoggerMock.VerwachtMethodCall("Warning","Productsynchronizatie AX - Admin","Voor principaal product 'IdentNummer' in AX bestaat het product voor SOPR contract 'vhbe-08614' nog niet." _ $$$CRLF _ "PM is verwittigd, geen actie nodig").DanDoeNiks()
 
-	Set Converter = ##class(AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverter).%New(ProductItemConverterMock,ProductAPIMock,ProductLookupMock,MailAPIMock,LoggerMock)
+	Set LockerMock = ##class(vhTest.Mock.TECH.Lock.MultiGlobalLocker).%New()
+	Do LockerMock.VerwachtMethodCall("ClearGlobalRefs").DanDoeNiks()
+	Do LockerMock.VerwachtMethodCall("VoegToeGlobalRef","^KPR(ProductID)").DanDoeNiks()
+	Do LockerMock.VerwachtMethodCall("Lock",1).DanReturn($$$True)
+	Do LockerMock.VerwachtMethodCall("Unlock").DanDoeNiks()
 	
+	Set Converter = ##class(AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverter).%New(ProductItemConverterMock,ProductAPIMock,ProductLookupMock,MailAPIMock,LoggerMock,LockerMock)
+	
 	Do Converter.Convert(Envelope)
 	Do ProductItemConverterMock.Verifieer()
 	Do ProductLookupMock.Verifieer()
 	Do MailAPIMock.Verifieer()
 	Do MailMock.Verifieer()
 	Do LoggerMock.Verifieer()
+	Do ProductAPIMock.Verifieer()
+	Do LockerMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -69,24 +78,32 @@
 	Do ProductItemConverterMock.VerwachtMethodCall("ConvertProductItem",..Matches.DataTransferObject(SOPR),"vhbe").DanDoeNiks().ExactAantalKeer(1)
 	
 	Set ProductLookupMock = ##class(vhTest.Mock.AXimpl.Admin.Common.ProductBepaler).%New()
-	Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","IdentNummer","L||5005","vhbe-08614").DanReturn("SOPRProductId")
+	Do ProductLookupMock.VerwachtMethodCall("GeefProductIdVoorLeverancierId","IdentNummer","L||5005","vhbe-08614").DanReturn("SOPRProductID")
 	
 	Set ProductMock = ##class(vhTest.Mock.DOM.PM.Product).%New()
 	Do ProductMock.VerwachtMethodCall("GeefIdentNr").DanReturn("SOPRIdentNummer")
 	DO ProductMock.VerwachtMethodCall("GeefKorttekst").DanReturn("SOPRKorttekst")
 	
 	#dim ProductAPIMock as vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
-	Do ProductAPIMock.VerwachtMethodCall("GeefProduct","SOPRProductId",).DanReturn(ProductMock)
+	Do ProductAPIMock.VerwachtMethodCall("GeefProductIdVoorIdentNummer","IdentNummer",).DanReturn("ProductID")
+	Do ProductAPIMock.VerwachtMethodCall("GeefProduct","SOPRProductID",).DanReturn(ProductMock)
 	
 	#dim MailAPIMock as vhTest.Mock.TECH.Mail.MailAPI = ##class(vhTest.Mock.TECH.Mail.MailAPI).MockInstance()
+	Set LockerMock = ##class(vhTest.Mock.TECH.Lock.MultiGlobalLocker).%New()
+	Do LockerMock.VerwachtMethodCall("ClearGlobalRefs").DanDoeNiks()
+	Do LockerMock.VerwachtMethodCall("VoegToeGlobalRef","^KPR(ProductID)").DanDoeNiks()
+	Do LockerMock.VerwachtMethodCall("VoegToeGlobalRef","^KPR(SOPRProductID)").DanDoeNiks()
+	Do LockerMock.VerwachtMethodCall("Lock",1).DanReturn($$$True)
+	Do LockerMock.VerwachtMethodCall("Unlock").DanDoeNiks()
 		
-	Set Converter = ##class(AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverter).%New(ProductItemConverterMock,ProductAPIMock,ProductLookupMock,MailAPIMock)	
+	Set Converter = ##class(AXimpl.Dynamics.ProductItemUpsertIn.Converter.EnvelopeConverter).%New(ProductItemConverterMock,ProductAPIMock,ProductLookupMock,MailAPIMock,,LockerMock)	
 	Do Converter.Convert(Envelope)
 
 	Do ProductMock.Verifieer()
 	Do ProductAPIMock.Verifieer()
 	Do ProductItemConverterMock.Verifieer()
 	Do ProductLookupMock.Verifieer()
+	Do LockerMock.Verifieer()
 ]]></Implementation>
 </Method>