mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-07-15 01:07:30 +08:00
Fix merge error
This commit is contained in:
parent
21d80d87a3
commit
9c5f207e22
@ -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);
|
||||
};
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user