Skip to content

Commit f30d19b

Browse files
committed
Disable Jackson's buffer recyling feature for WebFlux
Issue: SPR-17193
1 parent 2163fa9 commit f30d19b

File tree

1 file changed

+12
-9
lines changed

1 file changed

+12
-9
lines changed

spring-web/src/main/java/org/springframework/http/codec/json/AbstractJackson2Decoder.java

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2017 the original author or authors.
2+
* Copyright 2002-2018 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -56,11 +56,20 @@
5656
*/
5757
public abstract class AbstractJackson2Decoder extends Jackson2CodecSupport implements HttpMessageDecoder<Object> {
5858

59+
/**
60+
* Until https://github.com/FasterXML/jackson-core/issues/476 is resolved,
61+
* we need to ensure buffer recycling is off.
62+
*/
63+
private final JsonFactory jsonFactory;
64+
65+
5966
/**
6067
* Constructor with a Jackson {@link ObjectMapper} to use.
6168
*/
6269
protected AbstractJackson2Decoder(ObjectMapper mapper, MimeType... mimeTypes) {
6370
super(mapper, mimeTypes);
71+
this.jsonFactory = mapper.getFactory().copy()
72+
.disable(JsonFactory.Feature.USE_THREAD_LOCAL_FOR_BUFFER_RECYCLING);
6473
}
6574

6675

@@ -76,24 +85,18 @@ public boolean canDecode(ResolvableType elementType, @Nullable MimeType mimeType
7685
public Flux<Object> decode(Publisher<DataBuffer> input, ResolvableType elementType,
7786
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
7887

79-
Flux<TokenBuffer> tokens = tokenize(input, true);
88+
Flux<TokenBuffer> tokens = Jackson2Tokenizer.tokenize(Flux.from(input), this.jsonFactory, true);
8089
return decodeInternal(tokens, elementType, mimeType, hints);
8190
}
8291

8392
@Override
8493
public Mono<Object> decodeToMono(Publisher<DataBuffer> input, ResolvableType elementType,
8594
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
8695

87-
Flux<TokenBuffer> tokens = tokenize(input, false);
96+
Flux<TokenBuffer> tokens = Jackson2Tokenizer.tokenize(Flux.from(input), this.jsonFactory, false);
8897
return decodeInternal(tokens, elementType, mimeType, hints).singleOrEmpty();
8998
}
9099

91-
private Flux<TokenBuffer> tokenize(Publisher<DataBuffer> input, boolean tokenizeArrayElements) {
92-
Flux<DataBuffer> inputFlux = Flux.from(input);
93-
JsonFactory factory = getObjectMapper().getFactory();
94-
return Jackson2Tokenizer.tokenize(inputFlux, factory, tokenizeArrayElements);
95-
}
96-
97100
private Flux<Object> decodeInternal(Flux<TokenBuffer> tokens, ResolvableType elementType,
98101
@Nullable MimeType mimeType, @Nullable Map<String, Object> hints) {
99102

0 commit comments

Comments
 (0)