Skip to content

Fix issue #1307 FeignHttpMessageConverters concurrency issue #1374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pdeneve wants to merge 1 commit into from
+14 −10
Closed

Fix issue #1307 FeignHttpMessageConverters concurrency issue #1374

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions ...src/main/java/org/springframework/cloud/openfeign/support/FeignHttpMessageConverters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class FeignHttpMessageConverters {

private final ObjectProvider<HttpMessageConverterCustomizer> cloudCustomizers;

private List<HttpMessageConverter<?>> converters;
private volatile List<HttpMessageConverter<?>> converters;

public FeignHttpMessageConverters(ObjectProvider<ClientHttpMessageConvertersCustomizer> customizers,
ObjectProvider<HttpMessageConverterCustomizer> cloudCustomizers) {
Expand All @@ -51,16 +51,20 @@ public List<HttpMessageConverter<?>> getConverters() {

private void initConvertersIfRequired() {
if (this.converters == null) {
this.converters = new ArrayList<>();
HttpMessageConverters.ClientBuilder builder = HttpMessageConverters.forClient();
// TODO: allow disabling of registerDefaults
builder.registerDefaults();
// TODO: check if already added? Howto order?
synchronized (this) {
if (this.converters == null) {
this.converters = new ArrayList<>();
HttpMessageConverters.ClientBuilder builder = HttpMessageConverters.forClient();
// TODO: allow disabling of registerDefaults
builder.registerDefaults();
// TODO: check if already added? Howto order?

this.customizers.orderedStream().forEach(customizer -> customizer.customize(builder));
HttpMessageConverters hmc = builder.build();
hmc.forEach(converter -> converters.add(converter));
cloudCustomizers.forEach(customizer -> customizer.accept(this.converters));
this.customizers.orderedStream().forEach(customizer -> customizer.customize(builder));
HttpMessageConverters hmc = builder.build();
hmc.forEach(converter -> converters.add(converter));
cloudCustomizers.forEach(customizer -> customizer.accept(this.converters));
}
}
}
}

Expand Down