From df3fc4c9a67ad8492dbd53a7ba3687c565ac0b24 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Fri, 26 Feb 2021 15:06:30 -0500
Subject: [PATCH] Fix race condition in MixedDispatchConfigTests

---
 .../MixedDispatcherConfigurationScenarioTests.java       | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java
index edeb064a17..a85575dcd7 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java
@@ -32,10 +32,8 @@ import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.InOrder;
-import org.mockito.Mockito;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -84,11 +82,6 @@ public class MixedDispatcherConfigurationScenarioTests {
 	@Autowired
 	private ConfigurableApplicationContext ac;
 
-	@BeforeEach
-	public void initialize() {
-		Mockito.reset(this.exceptionRegistry, this.handlerA, this.handlerB, this.handlerC);
-	}
-
 	@Test
 	public void noFailoverNoLoadBalancing() {
 		DirectChannel channel = (DirectChannel) ac.getBean("noLoadBalancerNoFailover");
@@ -158,9 +151,9 @@ public class MixedDispatcherConfigurationScenarioTests {
 
 		doAnswer(invocation -> {
 			RuntimeException e = new RuntimeException();
-			allDone.countDown();
 			failed.set(true);
 			exceptionRegistry.add(e);
+			allDone.countDown();
 			throw e;
 		}).when(handlerA).handleMessage(message);