Fix concurrency issue in RetryTransactionalPollingIntegrationTests

IlyaNerd · Feb 1, 2019 · ffe158c · ffe158c
1 parent 797fe1b
commit ffe158c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/...rg/springframework/batch/integration/retry/RetryTransactionalPollingIntegrationTests.java b/...rg/springframework/batch/integration/retry/RetryTransactionalPollingIntegrationTests.java
@@ -5,6 +5,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -42,12 +43,12 @@ public void setApplicationContext(ApplicationContext applicationContext) throws
 		bus = (Lifecycle) applicationContext;
 	}
 
-	private static volatile int count = 0;
+	private static AtomicInteger count = new AtomicInteger(0);
 
 	@Before
 	public void clearLists() {
 		list.clear();
-		count = 0;
+		count.set(0);
 	}
 
 	public String input() {
@@ -61,7 +62,7 @@ public String input() {
 	}
 
 	public void output(String message) {
-		count++;
+		count.incrementAndGet();
 		logger.debug("Handled: " + message);
 	}
 

diff --git a/...-integration/src/test/java/org/springframework/batch/integration/retry/SimpleService.java b/...-integration/src/test/java/org/springframework/batch/integration/retry/SimpleService.java
@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -18,7 +19,7 @@ public class SimpleService implements Service {
 
 	private List<String> expected = new ArrayList<>();
 
-	private int count = 0;
+	private AtomicInteger count = new AtomicInteger(0);
 
 	public void setExpected(List<String> expected) {
 		this.expected = expected;
@@ -34,9 +35,9 @@ public List<String> getProcessed() {
 
 	@ServiceActivator(inputChannel = "requests", outputChannel = "replies")
 	public String process(String message) {
-		String result = message + ": " + (count++);
+		String result = message + ": " + count.incrementAndGet();
 		logger.debug("Handling: " + message);
-		if (count <= expected.size()) {
+		if (count.get() <= expected.size()) {
 			processed.add(message);
 		}
 		if ("fail".equals(message)) {