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

Fix merge error

Browse Source
This commit is contained in:
Phillip Webb
2018-05-25 20:57:46 -07:00
parent 21d80d87a3
commit 9c5f207e22
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java
View File

@@ -237,9 +237,8 @@ public class JerseyAutoConfiguration implements ServletContextAware {
final ObjectMapper objectMapper) {
addJaxbAnnotationIntrospectorIfPresent(objectMapper);
return (ResourceConfig config) -> {
JerseyAutoConfiguration.this.config.register(JacksonFeature.class);
JerseyAutoConfiguration.this.config.register(
new ObjectMapperContextResolver(objectMapper),
config.register(JacksonFeature.class);
config.register(new ObjectMapperContextResolver(objectMapper),
ContextResolver.class);
};
}