root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Support for multi-threaded addConverter calls 

Closes gh-26183
This commit is contained in:
Juergen Hoeller 2020-12-02 12:25:37 +01:00
parent 5328184f3a
commit 396fb0cd51
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-core/src/main/java/org/springframework/core/convert/support/GenericConversionService.java
View File

@ -17,17 +17,17 @@
package org.springframework.core.convert.support; package org.springframework.core.convert.support;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.util.ArrayDeque;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.Deque; import java.util.Deque;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentLinkedDeque;
import java.util.concurrent.CopyOnWriteArraySet;
import org.springframework.core.DecoratingProxy; import org.springframework.core.DecoratingProxy;
import org.springframework.core.ResolvableType; import org.springframework.core.ResolvableType;
@ -500,9 +500,9 @@ public class GenericConversionService implements ConfigurableConversionService {
*/ */
private static class Converters { private static class Converters {
private final Set<GenericConverter> globalConverters = new LinkedHashSet<>(); private final Set<GenericConverter> globalConverters = new CopyOnWriteArraySet<>();
private final Map<ConvertiblePair, ConvertersForPair> converters = new LinkedHashMap<>(36); private final Map<ConvertiblePair, ConvertersForPair> converters = new ConcurrentHashMap<>(256);
public void add(GenericConverter converter) { public void add(GenericConverter converter) {
Set<ConvertiblePair> convertibleTypes = converter.getConvertibleTypes(); Set<ConvertiblePair> convertibleTypes = converter.getConvertibleTypes();
@ -513,8 +513,7 @@ public class GenericConversionService implements ConfigurableConversionService {
} }
else { else {
for (ConvertiblePair convertiblePair : convertibleTypes) { for (ConvertiblePair convertiblePair : convertibleTypes) {
ConvertersForPair convertersForPair = getMatchableConverters(convertiblePair); getMatchableConverters(convertiblePair).add(converter);
convertersForPair.add(converter);
} }
} }
} }
@ -652,7 +651,7 @@ public class GenericConversionService implements ConfigurableConversionService {
*/ */
private static class ConvertersForPair { private static class ConvertersForPair {
private final Deque<GenericConverter> converters = new ArrayDeque<>(1); private final Deque<GenericConverter> converters = new ConcurrentLinkedDeque<>();
public void add(GenericConverter converter) { public void add(GenericConverter converter) {
this.converters.addFirst(converter); this.converters.addFirst(converter);