fix(eventBus): support cascade event dispatching with polling strategy

DaanVanYperen · Mar 14, 2017 · 58facfd · 58facfd
1 parent 174cbd1
commit 58facfd
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/...ventbus/src/main/java/net/mostlyoriginal/api/event/dispatcher/PollingEventDispatcher.java b/...ventbus/src/main/java/net/mostlyoriginal/api/event/dispatcher/PollingEventDispatcher.java
@@ -17,10 +17,19 @@ public class PollingEventDispatcher extends FastEventDispatcher {
 	@Override
 	public void process() {
 		Object[] eventsToDispatch = eventQueue.getData();
-
-		for (int i = 0, s = eventQueue.size(); i < s; i++) {
-			Event event = (Event) eventsToDispatch[i];
-			super.dispatch(event);
+
+		int i = 0;
+		int s = eventQueue.size();
+
+		while (i < s) {
+			for (; i < s; i++) {
+				Event event = (Event) eventsToDispatch[i];
+				super.dispatch(event);
+			}
+
+			// we may end up having more events to dispatch at this point
+			//  - some event handlers could dispatch more events
+			s = eventQueue.size();
 		}
 
 		eventQueue.clear();

diff --git a/...s/src/main/java/net/mostlyoriginal/api/event/dispatcher/PollingPooledEventDispatcher.java b/...s/src/main/java/net/mostlyoriginal/api/event/dispatcher/PollingPooledEventDispatcher.java
@@ -17,14 +17,22 @@ public class PollingPooledEventDispatcher extends FastEventDispatcher {
 	@Override
 	public void process() {
 		Object[] eventsToDispatch = eventQueue.getData();
-
-		for (int i = 0, s = eventQueue.size(); i < s; i++) {
-			Event event = (Event) eventsToDispatch[i];
 
-			super.dispatch(event);
-			pools.free(event);
+		int i = 0;
+		int s = eventQueue.size();
+
+		while (i < s) {
+			for (; i < s; i++) {
+				Event event = (Event) eventsToDispatch[i];
+				super.dispatch(event);
+				pools.free(event);
+			}
+
+			// we may end up having more events to dispatch at this point
+			//  - some event handlers could dispatch more events
+			s = eventQueue.size();
 		}
-		
+
 		eventQueue.clear();
 	}