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

Allow null ObjectMapper in Jackson2ObjectMapperFactoryBean.getObjectType()

Browse Source 
Issue: SPR-11785
This commit is contained in:
Sebastien Deleuze
2014-08-14 13:40:47 +02:00
parent 181299cc6c
commit ebc726a915
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-web/src/main/java/org/springframework/http/converter/json/Jackson2ObjectMapperFactoryBean.java
View File

@@ -486,8 +486,7 @@ public class Jackson2ObjectMapperFactoryBean implements FactoryBean<ObjectMapper
@Override
public Class<?> getObjectType() {
Assert.notNull(this.objectMapper, "ObjectMapper must not be null");
return this.objectMapper.getClass();
return (this.objectMapper != null) ? this.objectMapper.getClass() : null;
}
@Override