Merge pull request hehonghui#61 from yinyinnie/master

hehonghui · web-flow · commit 83795e5f8c25 · 2024-03-13T17:50:34.000+08:00
Fix thread safe issue on vivo and Motorola Android 12
diff --git a/library/src/main/java/org/simple/eventbus/EventBus.java b/library/src/main/java/org/simple/eventbus/EventBus.java
@@ -369,8 +369,11 @@ private class EventDispatcher {
          */
         void dispatchEvents(Object aEvent) {
             Queue<EventType> eventsQueue = mLocalEvents.get();
-            while (eventsQueue.size() > 0) {
-                deliveryEvent(eventsQueue.poll(), aEvent);
+            if (eventsQueue != null) {
+                EventType eventType;
+                while ((eventType = eventsQueue.poll()) != null) {
+                    deliveryEvent(eventType, aEvent);
+                }
             }
         }
 

Original file line number	Diff line number	Diff line change
`@@ -369,8 +369,11 @@ private class EventDispatcher {`
`369`	`369`	`*/`
`370`	`370`	`void dispatchEvents(Object aEvent) {`
`371`	`371`	`Queue<EventType> eventsQueue = mLocalEvents.get();`
`372`		`- while (eventsQueue.size() > 0) {`
`373`		`- deliveryEvent(eventsQueue.poll(), aEvent);`
	`372`	`+ if (eventsQueue != null) {`
	`373`	`+ EventType eventType;`
	`374`	`+ while ((eventType = eventsQueue.poll()) != null) {`
	`375`	`+ deliveryEvent(eventType, aEvent);`
	`376`	`+ }`
`374`	`377`	`}`
`375`	`378`	`}`
`376`	`379`