From d3204ab3ee2b0aee43d7a684fb658cb4506fcd12 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Tue, 9 Mar 2021 10:11:15 -0300 Subject: [PATCH] Use AtomicReference in TestEventListener to store event --- .../briarproject/briar/test/TestEventListener.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/briar-core/src/test/java/org/briarproject/briar/test/TestEventListener.java b/briar-core/src/test/java/org/briarproject/briar/test/TestEventListener.java index 3f9ffba82..c4a52f701 100644 --- a/briar-core/src/test/java/org/briarproject/briar/test/TestEventListener.java +++ b/briar-core/src/test/java/org/briarproject/briar/test/TestEventListener.java @@ -4,7 +4,7 @@ import org.briarproject.bramble.api.event.Event; import org.briarproject.bramble.api.event.EventListener; import org.briarproject.bramble.api.nullsafety.NotNullByDefault; -import javax.annotation.Nullable; +import java.util.concurrent.atomic.AtomicReference; import static org.briarproject.briar.test.BriarIntegrationTest.waitForEvents; import static org.junit.Assert.assertNotNull; @@ -38,21 +38,20 @@ public class TestEventListener implements EventListener { private final Class clazz; - @Nullable - private T event; + private final AtomicReference event = new AtomicReference<>(); @Override public void eventOccurred(Event e) { if (e.getClass().equals(clazz)) { - assertNull("Event already received", event); //noinspection unchecked - event = (T) e; + assertNull("Event already received", event.getAndSet((T) e)); } } private T assertAndGetEvent() { - assertNotNull("No event received", event); - return event; + T t = event.get(); + assertNotNull("No event received", t); + return t; } }