RESOLVED - issue BATCH-1541, BATCH-1542: Thread safety for map daos

spring-batch-infrastructure/src/main/java/org/springframework/batch/support/SerializationUtils.java

@@ -20,6 +20,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.io.OptionalDataException;
 
 
 /**
@@ -66,6 +67,9 @@ public class SerializationUtils {
 		try {
 			return new ObjectInputStream(new ByteArrayInputStream(bytes)).readObject();
 		}
+		catch (OptionalDataException e) {
+			throw new IllegalArgumentException("Could not deserialize object: eof="+e.eof+ " at length="+e.length, e);
+		}
 		catch (IOException e) {
 			throw new IllegalArgumentException("Could not deserialize object", e);
 		}

spring-batch-infrastructure/src/main/java/org/springframework/batch/support/transaction/TransactionAwareProxyFactory.java

@@ -23,6 +23,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 import org.aopalliance.intercept.MethodInterceptor;
 import org.aopalliance.intercept.MethodInvocation;
@@ -74,7 +75,7 @@ public class TransactionAwareProxyFactory<T> {
 			return (T) new HashSet((Set) target);
 		}
 		else if (target instanceof Map) {
-			return (T) new HashMap((Map) target);
+			return (T) new ConcurrentHashMap((Map) target);
 		}
 		else {
 			throw new UnsupportedOperationException("Cannot copy target for this type: " + target.getClass());

spring-batch-infrastructure/src/test/java/org/springframework/batch/support/MapSerializationUtilsTests.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2006-2010 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.batch.support;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.junit.Test;
+
+/**
+ * @author Dave Syer
+ * 
+ */
+public class MapSerializationUtilsTests {
+
+	private Map<String, Object> map = new ConcurrentHashMap<String, Object>();
+
+	@Test
+	public void testCycle() throws Exception {
+		map.put("foo.bar.spam", 123);
+		Map<String, Object> result = getCopy(map);
+		assertEquals(map, result);
+	}
+
+	@Test
+	public void testMultipleCycles() throws Exception {
+		map.put("foo.bar.spam", 123);
+		for (int i = 0; i < 1000; i++) {
+			Map<String, Object> result = getCopy(map);
+			assertEquals(map, result);
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	private Map<String, Object> getCopy(Map<String, Object> map) {
+		return (Map<String, Object>) SerializationUtils.deserialize(SerializationUtils.serialize(map));
+	}
+
+}