Index: TECH/PubSub/impl/EventDispatcher.cls.xml
===================================================================
diff -u -r1085 -r1089
--- TECH/PubSub/impl/EventDispatcher.cls.xml	(.../EventDispatcher.cls.xml)	(revision 1085)
+++ TECH/PubSub/impl/EventDispatcher.cls.xml	(.../EventDispatcher.cls.xml)	(revision 1089)
@@ -3,73 +3,99 @@
 <Class name="TECH.PubSub.impl.EventDispatcher">
 <ClassType/>
 <ProcedureBlock>1</ProcedureBlock>
-<Super>TECH.RegisteredObject</Super>
+<Super>TECH.RegisteredObject,TECH.PubSub.EventDispatcher</Super>
 
-<Method name="DispatchEventASync">
-<FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
+<Property name="Logger">
+<Type>vhLib.Logger</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="SubscriptionCollector">
+<Type>TECH.PubSub.EventSubscriptionCollector</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>SubscriptionCollector:TECH.PubSub.EventSubscriptionCollector</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Do ..LogEvent(Event)
-	
-	Set ResultSet = ##class(%ResultSet).%New(..%ClassName(1)_":qAlleSubscriptions")
-	#dim sc As %Status = ResultSet.Execute(Event)	
-	While (ResultSet.Next()){		
-		Set Subscription = ##class(TECH.PubSub.EventSubscription).%OpenId(ResultSet.Data("ID"))
-		
-		Try
-		{
-			Do $ZOBJCLASSMETHOD(Subscription.RespondingClass, Subscription.RespondingMethod, Event)
-		}
-		Catch (e)
-		{
-			Set Logger = ##class(TECH.PubSub.impl.PubSubLogger).%New()
-			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-			
-			#dim LogDetail As %String = ..GeefLogDetail(Event,Exception,Subscription)
-			Do Logger.ErrorMail(Exception.GeefOmschrijving(), LogDetail)
-						
-			if ##class(TECH.Config.ConfigMgr).Instance().GeefBoolean("TECH.PubSub.Rethrow_Exception") {
-				do ##class(TECH.ExceptionHandler).Throw(Exception)
-			}
-		}
-	}
-	
-	If $SYSTEM.Status.IsError(sc) Set Logger = ##class(TECH.PubSub.impl.PubSubLogger).%New().ErrorMail("/!\ Error bij het ophalen van de subscriptions /!\",$$ParseStatus^vhLib(sc))
-	
+	set ..SubscriptionCollector = $get(SubscriptionCollector,##class(TECH.PubSub.impl.EventSubscriptionCollector).%New())
+	set ..Logger = ##class(vhLib.Logger).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
+<Method name="DispatchEventASync">
+<FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	quit ..DispatchEvent(Event,##class(TECH.PubSub.impl.DispatchType).Asynchroon())
+]]></Implementation>
+</Method>
+
 <Method name="DispatchEventSync">
 <FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
 <ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[	quit ..DispatchEvent(Event,##class(TECH.PubSub.impl.DispatchType).Synchroon())
+]]></Implementation>
+</Method>
+
+<Method name="DispatchEvent">
+<FormalSpec>Event:TECH.PubSub.Event,DispatchType:TECH.PubSub.impl.DispatchType</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Do ..LogEvent(Event)
-	
-	Set ResultSet = ##class(%ResultSet).%New(..%ClassName(1)_":qAlleSubscriptions")
-	#dim sc As %Status = ResultSet.Execute(Event)	
-	While (ResultSet.Next()){		
-		Set Subscription = ##class(TECH.PubSub.EventSubscription).%OpenId(ResultSet.Data("ID"))
+	#dim stSubscriptions As %Status = $$$OK
+	#dim Subscriptions As TECH.PubSub.EventSubscriptionList = ..SubscriptionCollector.CollectSubscriptions(Event)
+	set SubscriptionCollectorIterator = ##class(TECH.ListIterator).%New(Subscriptions)
+	while SubscriptionCollectorIterator.HasNext() {
+		#dim Subscription As TECH.PubSub.EventSubscription = SubscriptionCollectorIterator.Next()  
+		set stSubscriptions = ..VoerUitSubscription(Subscription,Event,DispatchType)
+	}	
+	Quit stSubscriptions
+]]></Implementation>
+</Method>
+
+<Method name="VoerUitSubscription">
+<FormalSpec>Subscription:TECH.PubSub.EventSubscription,Event:TECH.PubSub.Event,DispatchType:TECH.PubSub.impl.DispatchType</FormalSpec>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	#dim stSubscriptions As %Status = $$$OK
+	try	{
 		Do $ZOBJCLASSMETHOD(Subscription.RespondingClass, Subscription.RespondingMethod, Event)
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		do:(DispatchType=##class(TECH.PubSub.impl.DispatchType).Asynchroon()) ..LogExceptie(Event,Exception,Subscription)
+		do:(DispatchType=##class(TECH.PubSub.impl.DispatchType).Synchroon()) ##class(TECH.ExceptionHandler).Throw(Exception)
+		set stSubscriptions = $$$ERROR($$$GeneralError,"aSubscriptionFailed")		
 	}
-	
-	If $SYSTEM.Status.IsError(sc) Set Logger = ##class(TECH.PubSub.impl.PubSubLogger).%New().ErrorMail("/!\ Error bij het ophalen van de subscriptions /!\",$$ParseStatus^vhLib(sc))
-	
-	Quit $$$OK
+	quit stSubscriptions
 ]]></Implementation>
 </Method>
 
 <Method name="LogEvent">
 <FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
 <Private>1</Private>
-<Implementation><![CDATA[	Do ##class(vhLib.Logger).%New("EventLog").Info(Event.%ClassName(1),"Data: "_$$LCVT^vhLib(..GeefGeserializeerdeString(Event)))
+<Implementation><![CDATA[	do ..Logger.Info(Event.%ClassName(1),"Data: "_$$LCVT^vhLib(..GeefGeserializeerdeString(Event)))
 ]]></Implementation>
 </Method>
 
+<Method name="LogExceptie">
+<FormalSpec>Event:TECH.PubSub.Event,Exception:TECH.Exceptions.Exception,Subscription:TECH.PubSub.EventSubscription</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim LogDetail As %String = ..GeefLogDetail(Event,Exception,Subscription)
+	Do ..Logger.ErrorMail(Exception.GeefOmschrijving(), LogDetail)
+]]></Implementation>
+</Method>
+
 <Method name="GeefLogDetail">
 <FormalSpec>Event:TECH.PubSub.Event,Exception:TECH.Exceptions.Exception,Subscription:TECH.PubSub.EventSubscription</FormalSpec>
 <Private>1</Private>
-<ReturnType>%Status</ReturnType>
+<ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim LogDetail As %String = ""
 
@@ -103,12 +129,6 @@
 	Quit SerializedObject
 ]]></Implementation>
 </Method>
-
-<Query name="qAlleSubscriptions">
-<Type>%SQLQuery</Type>
-<FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
-<SqlQuery>	SELECT ID FROM TECH_PubSub.EventSubscription WHERE EventType = :Event.Type</SqlQuery>
-</Query>
 </Class>