Change mapqueue to concurrentHashmap

code/moya-beans/ejbModule/fi/codecrew/moya/beans/QueueBean.java

@@ -47,11 +47,10 @@ public class QueueBean implements QueueBeanLocal {
 	 * Default constructor.
 	 * Default constructor.
 	 */
 	 */
 	public QueueBean() {
 	public QueueBean() {
-		mapqueues = new HashMap<>();
 		logger.info("Initialized2 QueueBean, {}", mapqueues);
 		logger.info("Initialized2 QueueBean, {}", mapqueues);
 	}
 	}
 
 
-	private final Map<Integer, MapQueue> mapqueues;
+	private final ConcurrentHashMap<Integer, MapQueue> mapqueues = new ConcurrentHashMap<Integer, QueueBean.MapQueue>();
 	private int defaultTimeoutMin = 10;
 	private int defaultTimeoutMin = 10;
 	private int minimumSlotsInQueue = 1;
 	private int minimumSlotsInQueue = 1;
 	private int reservingSize = 5;
 	private int reservingSize = 5;
@@ -297,11 +296,7 @@ public class QueueBean implements QueueBeanLocal {
 		MapQueue ret = mapqueues.get(map.getId());
 		MapQueue ret = mapqueues.get(map.getId());
 
 
 		if (ret == null) {
 		if (ret == null) {
-			logger.info("getMapqueue, {}", mapqueues);
-			synchronized (mapqueues) {
-				ret = new MapQueue();
-				mapqueues.put(map.getId(), ret);
-			}
+			ret = mapqueues.putIfAbsent(map.getId(), new MapQueue());
 		}
 		}
 		logger.info("returning queue {} for map {}", ret, map);
 		logger.info("returning queue {} for map {}", ret, map);
 		return ret;
 		return ret;