Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATCH-1709: Fix concurrency issue in BeanWrapperFieldSetMapper

Browse Source
This commit is contained in:
Dave Syer
2011-03-11 15:48:38 +00:00
parent 45996da55e
commit 3e3cfa1dff
3 changed files with 97 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/file/mapping/BeanWrapperFieldSetMapper.java
View File

@@ -22,6 +22,8 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.springframework.batch.item.file.transform.FieldSet;
import org.springframework.batch.support.DefaultPropertyEditorRegistrar;
@@ -94,7 +96,7 @@ public class BeanWrapperFieldSetMapper<T> extends DefaultPropertyEditorRegistrar
private BeanFactory beanFactory;
private static Map<DistanceHolder, Map<String, String>> propertiesMatched = new HashMap<DistanceHolder, Map<String, String>>();
private ConcurrentMap<DistanceHolder, ConcurrentMap<String, String>> propertiesMatched = new ConcurrentHashMap<DistanceHolder, ConcurrentMap<String, String>>();
private int distanceLimit = 5;
@@ -249,11 +251,10 @@ public class BeanWrapperFieldSetMapper<T> extends DefaultPropertyEditorRegistrar
// Map from field names to property names
DistanceHolder distanceKey = new DistanceHolder(cls, distanceLimit);
Map<String, String> matches = propertiesMatched.get(distanceKey);
if (matches == null) {
matches = new HashMap<String, String>();
propertiesMatched.put(distanceKey, matches);
if (!propertiesMatched.containsKey(distanceKey)) {
propertiesMatched.putIfAbsent(distanceKey, new ConcurrentHashMap<String, String>());
}
Map<String, String> matches = new HashMap<String, String>(propertiesMatched.get(distanceKey));
Set<String> keys = new HashSet(properties.keySet());
for (String key : keys) {
@@ -281,6 +282,9 @@ public class BeanWrapperFieldSetMapper<T> extends DefaultPropertyEditorRegistrar
}
}
if (!propertiesMatched.containsKey(distanceKey)) {
propertiesMatched.putIfAbsent(distanceKey, new ConcurrentHashMap<String, String>(matches));
}
return properties;
}
@@ -379,12 +383,13 @@ public class BeanWrapperFieldSetMapper<T> extends DefaultPropertyEditorRegistrar
private static class DistanceHolder {
private final Class<?> cls;
private final int distance;
public DistanceHolder(Class<?> cls, int distance) {
this.cls = cls;
this.distance = distance;
}
@Override
@@ -417,5 +422,4 @@ public class BeanWrapperFieldSetMapper<T> extends DefaultPropertyEditorRegistrar
}
}
}