[Java] Fix a race whereby subscription might try to add an image that…

… was already removed when Aeron client gets shutdown.
aeron-io · Oct 31, 2024 · f04d14a · f04d14a
1 parent 31b0c7e
commit f04d14a
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/aeron-system-tests/src/test/java/io/aeron/TaggedFlowControlSystemTest.java b/aeron-system-tests/src/test/java/io/aeron/TaggedFlowControlSystemTest.java
@@ -119,7 +119,7 @@ private void launch()
     @AfterEach
     void after()
     {
-        CloseHelper.closeAll(clientB, clientA, driverB, driverA);
+        CloseHelper.closeAll(subscriptionB, subscriptionA, publication, clientB, clientA, driverB, driverA);
     }
 
     private static Stream<Arguments> strategyConfigurations()
@@ -459,10 +459,8 @@ void shouldPreventConnectionUntilAtLeastOneSubscriberConnectedWithRequiredGroupS
 
         subscriptionA = clientA.addSubscription(uriWithGroupTag, STREAM_ID);
 
-        while (!publication.isConnected())
-        {
-            Tests.sleep(1);
-        }
+        Tests.awaitConnected(publication);
+        Tests.awaitConnected(subscriptionA);
     }
 
     @Test