Index: vhTest/Spy/TECH/PubSub/EventRaiser.cls.xml
===================================================================
diff -u -r3021 -r3025
--- vhTest/Spy/TECH/PubSub/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 3021)
+++ vhTest/Spy/TECH/PubSub/EventRaiser.cls.xml	(.../EventRaiser.cls.xml)	(revision 3025)
@@ -3,18 +3,6 @@
 <Class name="vhTest.Spy.TECH.PubSub.EventRaiser">
 <Super>TECH.RegisteredObject,TECH.PubSub.EventRaiser</Super>
 
-<Property name="AsyncEventList">
-<Type>TECH.PubSub.Event</Type>
-<Collection>list</Collection>
-<Private>1</Private>
-</Property>
-
-<Property name="SyncEventList">
-<Type>TECH.PubSub.Event</Type>
-<Collection>list</Collection>
-<Private>1</Private>
-</Property>
-
 <Property name="AsyncEvents">
 <Type>%ListOfObjects</Type>
 <Collection>array</Collection>
@@ -41,51 +29,58 @@
 <Method name="RaiseEventAsync">
 <FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	do ..AsyncEventList.Insert(Event)
-	do ..AddEventToArrayList( Event,..AsyncEvents )
+<Implementation><![CDATA[	do ..AddEventToArrayList( Event,..AsyncEvents )
 ]]></Implementation>
 </Method>
 
 <Method name="RaiseEventSync">
 <FormalSpec>Event:TECH.PubSub.Event</FormalSpec>
 <ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	do ..SyncEventList.Insert(Event)
-	do ..AddEventToArrayList( Event,..SyncEvents )
+<Implementation><![CDATA[	do ..AddEventToArrayList( Event,..SyncEvents )
 ]]></Implementation>
 </Method>
 
 <Method name="GeefAsynchroneEvents">
 <ReturnType>TECH.PubSub.EventList</ReturnType>
-<Implementation><![CDATA[	quit ..AsyncEventList
+<Implementation><![CDATA[	Quit ..GeefEvents(..AsyncEvents)
 ]]></Implementation>
 </Method>
 
 <Method name="GeefSynchroneEvents">
 <ReturnType>TECH.PubSub.EventList</ReturnType>
-<Implementation><![CDATA[	quit ..SyncEventList
+<Implementation><![CDATA[	Quit ..GeefEvents(..SyncEvents)
 ]]></Implementation>
 </Method>
 
+<Method name="GeefEvents">
+<FormalSpec>EventList:%ListOfObjects</FormalSpec>
+<Private>1</Private>
+<ReturnType>TECH.PubSub.EventList</ReturnType>
+<Implementation><![CDATA[
+	Set AsyncEventList = ##class(TECH.PubSub.EventList).%New()
+	
+	Set AsyncEventsArrayIterator = ##class(TECH.ListIterator).%New(EventList)
+	While AsyncEventsArrayIterator.HasNext() {
+		Set AsyncEventsIterator = ##class(TECH.ListIterator).%New(AsyncEventsArrayIterator.Next())
+		While AsyncEventsIterator.HasNext() {
+			Do AsyncEventList.Insert(AsyncEventsIterator.Next())
+		}
+	}
+	
+	Quit AsyncEventList
+]]></Implementation>
+</Method>
+
 <Method name="IsEventGeraised">
 <FormalSpec>EventType:%String,EventData:TECH.PubSub.EventData=""</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	#dim EventGeraisedFoutBoodschap As %String = "Event '"_EventType_"' niet geraised"
-	Set AsynchroneEventsIt = ##class(TECH.ListIterator).%New(..GeefAsynchroneEvents())
-
-	While AsynchroneEventsIt.HasNext()
-	{
-		#dim AsynchroneEvent As TECH.PubSub.Event =  AsynchroneEventsIt.Next()
-		If (AsynchroneEvent.Type = EventType){
-			Set EventGeraisedFoutBoodschap = ""
-			
-			If $IsObject(EventData) {
-			  set EventGeraisedFoutBoodschap = ##class(TECH.ListUtils).ListToPieces(..ObjectDifferenciator.GetDifferences(EventData,AsynchroneEvent.Data),$$$CRLF)
-			}
+	If $$$Not(..AsyncEvents.GetAt(EventType) = "") {
+		Set EventGeraisedFoutBoodschap = ""
+		If $IsObject(EventData) {
+		  set EventGeraisedFoutBoodschap = ##class(TECH.ListUtils).ListToPieces(..ObjectDifferenciator.GetDifferences(EventData,..AsyncEvents.GetAt(EventType).GetAt(1).Data),$$$CRLF)
 		}
-		
 	}
 	quit EventGeraisedFoutBoodschap
 ]]></Implementation>