From eafa7ee1525461d5af8618e3298a68ea830ff277 Mon Sep 17 00:00:00 2001
From: Michael Minella <mminella@pivotal.io>
Date: Thu, 15 Oct 2015 16:02:28 -0500
Subject: [PATCH] BATCH-2313: Fixed regression of BATCH-2153 by updating
 HashMap to ConcurrentHashMap

---
 .../core/scope/context/SynchronizationManagerSupport.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/SynchronizationManagerSupport.java b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/SynchronizationManagerSupport.java
index 9f6eb78a0..dea01286e 100644
--- a/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/SynchronizationManagerSupport.java
+++ b/spring-batch-core/src/main/java/org/springframework/batch/core/scope/context/SynchronizationManagerSupport.java
@@ -15,9 +15,9 @@
  */
 package org.springframework.batch.core.scope.context;
 
-import java.util.HashMap;
 import java.util.Map;
 import java.util.Stack;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.springframework.batch.core.jsr.configuration.support.BatchPropertyContext;
@@ -53,12 +53,12 @@ public abstract class SynchronizationManagerSupport<E, C> {
 	 * Reference counter for each execution: how many threads are using the
 	 * same one?
 	 */
-	private final Map<E, AtomicInteger> counts = new HashMap<E, AtomicInteger>();
+	private final Map<E, AtomicInteger> counts = new ConcurrentHashMap<E, AtomicInteger>();
 
 	/**
 	 * Simple map from a running execution to the associated context.
 	 */
-	private final Map<E, C> contexts = new HashMap<E, C>();
+	private final Map<E, C> contexts = new ConcurrentHashMap<E, C>();
 
 	/**
 	 * Getter for the current context if there is one, otherwise returns null.