Commit e403dda1 by olly Committed by Oliver Woodman

End ListenerSet iteration sooner

PiperOrigin-RevId: 384500287
parent 949f715c
...@@ -179,7 +179,7 @@ public final class ListenerSet<T> { ...@@ -179,7 +179,7 @@ public final class ListenerSet<T> {
return; return;
} }
if (!handler.hasMessages(MSG_ITERATION_FINISHED)) { if (!handler.hasMessages(MSG_ITERATION_FINISHED)) {
handler.obtainMessage(MSG_ITERATION_FINISHED).sendToTarget(); handler.sendMessageAtFrontOfQueue(handler.obtainMessage(MSG_ITERATION_FINISHED));
} }
boolean recursiveFlushInProgress = !flushingEvents.isEmpty(); boolean recursiveFlushInProgress = !flushingEvents.isEmpty();
flushingEvents.addAll(queuedEvents); flushingEvents.addAll(queuedEvents);
......
...@@ -390,8 +390,8 @@ public class ListenerSetTest { ...@@ -390,8 +390,8 @@ public class ListenerSetTest {
// lazy release. // lazy release.
verify(listener, times(3)).callback1(); verify(listener, times(3)).callback1();
verify(listener).callback3(); verify(listener).callback3();
verify(listener).iterationFinished(createFlagSet(EVENT_ID_1)); verify(listener, times(2)).iterationFinished(createFlagSet(EVENT_ID_1));
verify(listener).iterationFinished(createFlagSet(EVENT_ID_1, EVENT_ID_3)); verify(listener).iterationFinished(createFlagSet(EVENT_ID_3));
verifyNoMoreInteractions(listener); verifyNoMoreInteractions(listener);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment